More Rubocop fixes
Final prep for adding Stripe support. Now only supporting Stripe