Refactor Game class