Some refactoring. Setup animation.