Simplify animation event logic
Refactor Animator
Improvements to the animation