Refactoring: GameState is passed to proper methods