Tidy up collection processing