Minor code cleanup
Merge branch 'master' of github.com:dmastylo/chat_client