Refactor the client
Be more consistent when placing blank lines and add/edit some messages