Cleaned up and fixed BallHandler state machine