Refactor connect module to simplify scope

[asilvas]

After numerous heap dumps, there appears to be a memory leak associated with capturing scope, possibly due to the async module and/or timeouts. Could refactor to use Promises, but it's not yet clear if this will resolve.