Animation improvement, refactoring