Refactoring and do an animation