Refactored animation