Code review for new payment work