Refactored GameControllerStates