Refactoring for USA Moneris adding