Refactoring: animation -> AnimationController