Tidy up comments