Minor refactoring in Game class