HCOLL-269  minor refactors