Further comment changes for reformat