Some simple cleanup.
Connect/reconnect fix.