cleaning and fix animation