As per title, following up the review https://github.com/SegmentLinking/cmssw/pull/92#pullrequestreview-2319727124 in #92, and partially resolving #96. FYI @bucket420