HCOLL-167 more refactoring...