Tidying up and adding methods to Game