Refactor Paypal Express