Proper game state management