[#129911455] [#129911623] minor refactoring changes required for these two mentioned stories
[#129911455] [#129911623] minor refactoring changes required for these two mentioned stories

evernym/zeno,evernym/plenum