Refactoring how the game is represented