Commenting and cleaning