More simplification of GameState