Refactoring of the current animations