refactor Game class