Streamlined generation of comment text parts
Somed minor cosmetic fixes