* [Complex Relayers] Deduplicate l2r and r2l logic

Signed-off-by: Serban Iorga <[email protected]>

* Renamings