Comments and clean