Re-factored Paypal connector

Re-factored Paypal connector after review