Refactored Animator State