Tidy up the comments