Cleaned up comments and removed disconnect message