refactored game state a bit