little refactoring in Game