Cleaned up

Preparing to implement receiving messages from the server.