refactoring
improving animations