Tidy up comments, to make it easier to review