Further comment changes for reformat (master)