Tidy up comments a little