Reference tidy up