Issue #3211220: Code clean up

Daniel Pickering requested to merge issue/commerce_realex-3211220:3211220-code-clean-up into 8.x-1.x Apr 28, 2021