MDL-30997 - group - trailing whitespace + comment alignment fixes