Cleaning up the game client

also preparing for moving the character arround