Game class refactor