Curator comments formatting

Another PR cause I accidentally merged #2920. This one includes @sibyl229's changes