Cleaning code and animations