Minor changes to PaymentService class