Small animations refactoring