Did some refactoring in the Game class