Tidy up connection status and add comments