diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index 44366cd64..4db217574 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -63,9 +63,7 @@ class Registrar
 
       possible_users = ApiUser.where(identity_code: idc) || User.new
       possible_users.each do |selected_user|
-        if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
-          return selected_user
-        end
+        return selected_user if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
       end
     end
 
diff --git a/app/controllers/registrar/xml_consoles_controller.rb b/app/controllers/registrar/xml_consoles_controller.rb
index f4aba12ed..ba2fc6531 100644
--- a/app/controllers/registrar/xml_consoles_controller.rb
+++ b/app/controllers/registrar/xml_consoles_controller.rb
@@ -22,7 +22,7 @@ class Registrar
 
     def load_xml
       cl_trid = "#{depp_current_user.tag}-#{Time.zone.now.to_i}"
-      xml_dir_path = Rails.root.join('app', 'views', 'registrar', 'xml_consoles', 'epp_requests').to_s
+      xml_dir_path = Rails.root.join('app/views/registrar/xml_consoles/epp_requests').to_s
       xml = File.read("#{xml_dir_path}/#{params[:obj]}/#{params[:epp_action]}.xml")
       xml = prepare_payload(xml, cl_trid)
 
diff --git a/app/helpers/object_versions_helper.rb b/app/helpers/object_versions_helper.rb
index be8ef1217..dae357cf6 100644
--- a/app/helpers/object_versions_helper.rb
+++ b/app/helpers/object_versions_helper.rb
@@ -2,9 +2,7 @@ module ObjectVersionsHelper
   def attach_existing_fields(version, new_object)
     version.object_changes.to_h.each do |key, value|
       method_name = "#{key}=".to_sym
-      if new_object.respond_to?(method_name)
-        new_object.public_send(method_name, event_value(version, value))
-      end
+      new_object.public_send(method_name, event_value(version, value)) if new_object.respond_to?(method_name)
     end
   end
 
diff --git a/app/interactions/domains/expire_period/base.rb b/app/interactions/domains/expire_period/base.rb
index aa42f5ffa..3ba8d8e3c 100644
--- a/app/interactions/domains/expire_period/base.rb
+++ b/app/interactions/domains/expire_period/base.rb
@@ -7,7 +7,7 @@ module Domains
       end
 
       def logger
-        @logger ||= Logger.new(Rails.root.join('log', 'domain_expire_period.log'))
+        @logger ||= Logger.new(Rails.root.join('log/domain_expire_period.log'))
       end
     end
   end
diff --git a/app/jobs/migrate_before_force_delete_statuses_job.rb b/app/jobs/migrate_before_force_delete_statuses_job.rb
index f65538d50..7e6a1e1c0 100644
--- a/app/jobs/migrate_before_force_delete_statuses_job.rb
+++ b/app/jobs/migrate_before_force_delete_statuses_job.rb
@@ -31,6 +31,6 @@ class MigrateBeforeForceDeleteStatusesJob < ApplicationJob
   end
 
   def logger
-    @logger ||= Logger.new(Rails.root.join('log', 'migrate_before_force_delete_statuses.log'))
+    @logger ||= Logger.new(Rails.root.join('log/migrate_before_force_delete_statuses.log'))
   end
 end
diff --git a/app/jobs/migrate_statuses_to_domain_history_job.rb b/app/jobs/migrate_statuses_to_domain_history_job.rb
index a1750c1e6..f35c986b6 100644
--- a/app/jobs/migrate_statuses_to_domain_history_job.rb
+++ b/app/jobs/migrate_statuses_to_domain_history_job.rb
@@ -31,6 +31,6 @@ class MigrateStatusesToDomainHistoryJob < ApplicationJob
   end
 
   def logger
-    @logger ||= Logger.new(Rails.root.join('log', 'migrate_statuses_to_domain_history.log'))
+    @logger ||= Logger.new(Rails.root.join('log/migrate_statuses_to_domain_history.log'))
   end
 end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 2fdb84366..ae15d0374 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,5 +1,5 @@
 class ApplicationMailer < ActionMailer::Base
-  append_view_path Rails.root.join('app', 'views', 'mailers')
+  append_view_path Rails.root.join('app/views/mailers')
   layout 'mailer'
 
   def registrant_confirm_url(domain:, method:)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index b9f93f255..4ff478fb2 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -325,12 +325,9 @@ class Epp::Domain < Domain
       return false
     end
 
-    if (statuses &
-      [DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED]).any?
-      begin
-        errors.add(:base, :domain_status_prohibits_operation)
-        return false
-      end
+    if (statuses & [DomainStatus::CLIENT_DELETE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED]).any?
+      errors.add(:base, :domain_status_prohibits_operation)
+      return false
     end
 
     true
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index b8977e409..06407a8bf 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -13,6 +13,7 @@ class Invoice < ApplicationRecord
 
   accepts_nested_attributes_for :items
   # rubocop:disable Layout/LineLength
+  # rubocop:disable Style/MultilineBlockLayout
   scope :all_columns,                    -> { select("invoices.*") }
   scope :sort_due_date_column,           -> { all_columns.select("CASE WHEN invoices.cancelled_at is not null THEN
                                                                 (invoices.cancelled_at + interval '100 year') ELSE
@@ -28,6 +29,7 @@ class Invoice < ApplicationRecord
 
   scope :overdue, -> { unpaid.non_cancelled.where('due_date < ?', Time.zone.today) }
   # rubocop:enable Layout/LineLength
+  # rubocop:enable Style/MultilineBlockLayout
   validates :due_date, :currency, :seller_name,
             :seller_iban, :buyer_name, :items, presence: true
 
@@ -38,7 +40,7 @@ class Invoice < ApplicationRecord
   attribute :vat_rate, ::Type::VatRate.new
 
   def set_invoice_number
-    last_no = Invoice.order(number: :desc).limit(1).pluck(:number).first
+    last_no = Invoice.order(number: :desc).limit(1).pick(:number)
 
     if last_no && last_no >= Setting.invoice_number_min.to_i
       self.number = last_no + 1