#1141 Comment improvements