Comments: A little maintenance