HCOLL-74 refactors