Refactor, update to latest Stripe API version