diff --git a/app/assets/javascripts/admin/payments/directives/stripe_elements.js.coffee b/app/assets/javascripts/admin/payments/directives/stripe_elements.js.coffee
index b478a3f970..d9de8a2d54 100644
--- a/app/assets/javascripts/admin/payments/directives/stripe_elements.js.coffee
+++ b/app/assets/javascripts/admin/payments/directives/stripe_elements.js.coffee
@@ -29,6 +29,7 @@ angular.module('admin.payments').directive "stripeElements", ($injector, AdminSt
           displayError.textContent = event.error.message
         else
           displayError.textContent = ''
+
         return
 
       AdminStripeElements.stripe = stripe
diff --git a/app/assets/javascripts/admin/payments/services/stripe_elements.js.coffee b/app/assets/javascripts/admin/payments/services/stripe_elements.js.coffee
index ea8ebe6510..03971be228 100644
--- a/app/assets/javascripts/admin/payments/services/stripe_elements.js.coffee
+++ b/app/assets/javascripts/admin/payments/services/stripe_elements.js.coffee
@@ -22,19 +22,13 @@ angular.module("admin.payments").factory 'AdminStripeElements', ($rootScope, Sta
 
     # Maps the brand returned by Stripe to that required by activemerchant
     mapCC: (ccType) ->
-      if ccType == 'MasterCard'
-        return 'master'
-      else if ccType == 'Visa'
-        return 'visa'
-      else if ccType == 'American Express'
-        return 'american_express'
-      else if ccType == 'Discover'
-        return 'discover'
-      else if ccType == 'JCB'
-        return 'jcb'
-      else if ccType == 'Diners Club'
-        return 'diners_club'
-      return
+      switch ccType
+        when 'MasterCard' then return 'master'
+        when 'Visa' then return 'visa'
+        when 'American Express' then return 'american_express'
+        when 'Discover' then return 'discover'
+        when 'JCB' then return 'jcb'
+        when 'Diners Club' then return 'diners_club'
 
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
diff --git a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
index 1b0db2dcc9..32b0535251 100644
--- a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
@@ -25,19 +25,13 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
 
     # Maps the brand returned by Stripe to that required by activemerchant
     mapCC: (ccType) ->
-      if ccType == 'MasterCard'
-        return 'master'
-      else if ccType == 'Visa'
-        return 'visa'
-      else if ccType == 'American Express'
-        return 'american_express'
-      else if ccType == 'Discover'
-        return 'discover'
-      else if ccType == 'JCB'
-        return 'jcb'
-      else if ccType == 'Diners Club'
-        return 'diners_club'
-      return
+      switch ccType
+        when 'MasterCard' then return 'master'
+        when 'Visa' then return 'visa'
+        when 'American Express' then return 'american_express'
+        when 'Discover' then return 'discover'
+        when 'JCB' then return 'jcb'
+        when 'Diners Club' then return 'diners_club'
 
     # It doesn't matter if any of these are nil, all are optional.
     makeCardData: (secrets) ->
diff --git a/app/views/spree/admin/payments/_form.html.erb b/app/views/spree/admin/payments/_form.html.erb
index 4b7d576db5..629785fd45 100644
--- a/app/views/spree/admin/payments/_form.html.erb
+++ b/app/views/spree/admin/payments/_form.html.erb
@@ -2,7 +2,7 @@
   <div class="alpha three columns">
     <div class="field">
       <%= f.label :amount, t(:amount) %>
-      <%= f.text_field :amount, :value => @order.outstanding_balance, :class => 'fullwidth', "watch-value-as" => 'form_data.amount', "ng-init" => "form_data.amount=#{@order.outstanding_balance}" %>
+      <%= f.text_field :amount, :value => @order.outstanding_balance, :class => 'fullwidth', "watch-value-as" => 'form_data.amount' %>
     </div>
   </div>
   <div class="omega nine columns">