diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index 379fac25a..073ab3214 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -40,6 +40,7 @@ class RegistrantUser < User
     { result: false, counter: 0 }
   end
 
+  # rubocop:disable Metrics/MethodLength
   def update_contacts
     user = self
     contacts = []
@@ -47,7 +48,7 @@ class RegistrantUser < User
       c.write_attribute(:name, user.username)
     end)
     companies.each do |company|
-      contacts.concat(Contact.with_different_company_name(company).each do |c| 
+      contacts.concat(Contact.with_different_company_name(company).each do |c|
         c.write_attribute(:name, company.company_name)
       end)
     end
@@ -55,9 +56,9 @@ class RegistrantUser < User
     return [] if contacts.blank?
 
     group_and_bulk_update(contacts)
-
     contacts
   end
+  # rubocop:enable Metrics/MethodLength
 
   def contacts(representable: true)
     Contact.registrant_user_contacts(self, representable: representable)
@@ -138,8 +139,7 @@ class RegistrantUser < User
   private
 
   def group_and_bulk_update(contacts)
-    grouped_contacts = contacts.group_by(&:registrar_id)
-    grouped_contacts.each do |registrar_id, reg_contacts|
+    contacts.group_by(&:registrar_id).each do |registrar_id, reg_contacts|
       bulk_action, action = actions.create!(operation: :bulk_update) if reg_contacts.size > 1
       reg_contacts.each do |c|
         if c.save(validate: false)
diff --git a/app/views/epp/poll/_extension.xml.builder b/app/views/epp/poll/_extension.xml.builder
index 3682581c0..5a17995df 100644
--- a/app/views/epp/poll/_extension.xml.builder
+++ b/app/views/epp/poll/_extension.xml.builder
@@ -8,10 +8,12 @@ builder.extension do
       builder.tag!('changePoll:date', obj.created_at.utc.xmlschema)
       builder.tag!('changePoll:svTRID', obj.id)
       builder.tag!('changePoll:who', obj.user)
-      builder.tag!(
-        'changePoll:reason',
-        'Auto-update according to official data'
-      ) if obj.bulk_action?
+      if obj.bulk_action?
+        builder.tag!(
+          'changePoll:reason',
+          'Auto-update according to official data'
+        )
+      end
     when 'state'
       builder.tag!('changePoll:operation', obj)
     end