HCOLL-94 refactorings and cleanup