simplify flow logic

Simply some if/else flows.

_Includes the 'relationshipPathName' fix from #5._