cleanup + animation comments