HCOLL-71 refactors and java doc