Adds refactored code, including a Game class