Refactor GameState