Comments and cleaning2