Animation Refactoring