Paypal refactor