Refactored game states.