Game class refactored