Game class refactoring