Tidy up the reference fields and comments