Refactor payment/authorization processing