Tidy up the reference classes