spacing and small optimisations

4 files changed, 8 insertions, 9 deletions

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index 227c87602fc..caddbf505fe 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -1,8 +1,7 @@
 module Emails
   class BaseService
-    def initialize(user, opts = {})
-      @user = user
-      @email = opts[:email]
+    def initialize(user, params = {})
+      @user, @params = user, params.dup
     end
   end
 end
diff --git a/app/services/emails/confirm_service.rb b/app/services/emails/confirm_service.rb
index e764f18ddd0..b5301bf2b82 100644
--- a/app/services/emails/confirm_service.rb
+++ b/app/services/emails/confirm_service.rb
@@ -1,7 +1,7 @@
 module Emails
   class ConfirmService < ::Emails::BaseService
-    def execute(email_record)
-      email_record.resend_confirmation_instructions
+    def execute(email)
+      email.resend_confirmation_instructions
     end
   end
 end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 0f6a1e24f02..94a841af7c3 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -1,7 +1,7 @@
 module Emails
   class CreateService < ::Emails::BaseService
-    def execute(options = {})
-      @user.emails.create({ email: @email }.merge(options))
+    def execute(extra_params = {})
+      @user.emails.create(@params.merge(extra_params))
     end
   end
 end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index d29d7e69bde..aef863bd9d1 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,7 +1,7 @@
 module Emails
   class DestroyService < ::Emails::BaseService
-    def execute(email_record)
-      email_record.destroy && update_secondary_emails!
+    def execute(email)
+      email.destroy && update_secondary_emails!
     end
 
     private