Improved animations performances
Reformatted Code