Collector refurb (tidy up)