Refactor Game 3