code cleanup and renaming animation file