Refactor Game class
Refactor Game class