Work on cleaning up the Server/Client code