Refactored animations