some refactoring in Game class