Refactor animation
Refactor animation