reformatting and comment grooming

reformatting and comment grooming