Refactoring and animating