Refactor PaymentList code