Refactoring GameState