Refactoring PaymentController