initial cleanup
refactor code
paypal integration