HCOLL-134 minor refactor of node discovery