diff --git a/app/models/domain.rb b/app/models/domain.rb
index f409c0014..50e8b6fa4 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -318,6 +318,7 @@ class Domain < ActiveRecord::Base
     pending_json[:domain] = changes_cache
   end
 
+  # rubocop: disable Metrics/CyclomaticComplexity
   def registrant_update_confirmable?(token)
     return true if Rails.env.development?
     return false unless pending_update?
@@ -337,6 +338,7 @@ class Domain < ActiveRecord::Base
     return false if registrant_verification_token != token
     true
   end
+  # rubocop: enable Metrics/CyclomaticComplexity
 
   def force_deletable?
     !statuses.include?(DomainStatus::FORCE_DELETE)
@@ -362,7 +364,7 @@ class Domain < ActiveRecord::Base
     self.epp_pending_delete = true # for epp
 
     return true unless registrant_verification_asked?
-    statuses = [DomainStatus::PENDING_DELETE]
+    self.statuses = [DomainStatus::PENDING_DELETE]
     save(validate: false) # should check if this did succeed
 
     DomainMailer.pending_deleted(self).deliver_now
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index e9507d955..a6f840cf5 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -369,7 +369,9 @@ class Epp::Domain < Domain
     at[:admin_domain_contacts_attributes] += at_add[:admin_domain_contacts_attributes]
     at[:tech_domain_contacts_attributes] += at_add[:tech_domain_contacts_attributes]
     at[:dnskeys_attributes] += at_add[:dnskeys_attributes]
-    at[:statuses] = statuses - domain_statuses_attrs(frame.css('rem'), 'rem') + domain_statuses_attrs(frame.css('add'), 'add')
+    at[:statuses] = 
+      statuses - domain_statuses_attrs(frame.css('rem'), 'rem') + domain_statuses_attrs(frame.css('add'), 'add')
+
     # at[:statuses] += at_add[:domain_statuses_attributes]
 
     if verify && frame.css('registrant').present? && frame.css('registrant').attr('verified').to_s.downcase != 'yes'
@@ -385,9 +387,7 @@ class Epp::Domain < Domain
     frame = Nokogiri::XML(pending_json['frame'])
     statuses.delete(DomainStatus::PENDING_UPDATE)
 
-    if update(frame, user, false)
-      clean_pendings!
-    end
+    clean_pendings! if update(frame, user, false)
   end
 
   def attach_legal_document(legal_document_data)
diff --git a/app/models/registrant_verification.rb b/app/models/registrant_verification.rb
index 99a3e3e60..fb7a56839 100644
--- a/app/models/registrant_verification.rb
+++ b/app/models/registrant_verification.rb
@@ -17,16 +17,12 @@ class RegistrantVerification < ActiveRecord::Base
   def domain_registrant_change_confirm!
     self.action_type = DOMAIN_REGISTRANT_CHANGE
     self.action = CONFIRMED
-    if save
-      DomainConfirmJob.enqueue domain.id, CONFIRMED
-    end
+    DomainConfirmJob.enqueue domain.id, CONFIRMED if save
   end
 
   def domain_registrant_change_reject!
     self.action_type = DOMAIN_REGISTRANT_CHANGE
     self.action = REJECTED
-    if save
-      DomainConfirmJob.enqueue domain.id, REJECTED
-    end
+    DomainConfirmJob.enqueue domain.id, REJECTED if save
   end
 end
diff --git a/lib/devise_custom_failure.rb b/lib/devise_custom_failure.rb
index aa2f35fe5..b902486d4 100644
--- a/lib/devise_custom_failure.rb
+++ b/lib/devise_custom_failure.rb
@@ -2,7 +2,7 @@ class DeviseCustomFailure < Devise::FailureApp
   def redirect_url
     return registrant_login_url if request.original_fullpath.to_s.match(/^\/registrant/)
     return registrar_login_url  if request.original_fullpath.to_s.match(/^\/registrar/)
-    return '/admin'             if request.original_fullpath.to_s.match(/^\/admin\/que/)
+    return '/admin'             if request.original_fullpath.to_s.match(%r{^\/admin\/que})
     return admin_login_url      if request.original_fullpath.to_s.match(/^\/admin/)
     root_url
   end
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 1b04aa215..c966438b4 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -235,6 +235,7 @@ namespace :import do
       legacy_contact_id
     )
 
+    # rubocop: disable Lint/UselessAssignment
     domain_status_columns = %w(
       description
       value
@@ -242,6 +243,7 @@ namespace :import do
       updator_str
       legacy_domain_id
     )
+    # rubocop: enable Lint/UselessAssignment
 
     nameserver_columns = %w(
       hostname
@@ -292,9 +294,7 @@ namespace :import do
         end
 
         # OK status is default
-        if ok
-          domain_statuses << DomainStatus::OK
-        end
+        domain_statuses << DomainStatus::OK if ok
 
         domains << [
           x.object_registry.name.try(:strip),