Initial progress on cleaning up makePayment