diff --git a/app/models/sorted_country.rb b/app/models/sorted_country.rb
index e4f2ad330..19ad5f4f3 100644
--- a/app/models/sorted_country.rb
+++ b/app/models/sorted_country.rb
@@ -3,13 +3,13 @@ class SortedCountry
     include ActionView::Helpers
 
     def all_options(selected = nil)
-      quick_options = options_for_select(quick_list, { selected: selected })  
+      quick_options = options_for_select(quick_list, selected: selected)
 
       # no double select
-      selected = quick_list.map(&:second).include?(selected) ? '' : selected 
+      selected = quick_list.map(&:second).include?(selected) ? '' : selected
 
-      all_options = options_for_select([['---', '---']] + all_sorted_truncated, 
-                                       { selected: selected, disabled: ['---'] })
+      all_options = options_for_select([['---', '---']] + all_sorted_truncated,
+                                       selected: selected, disabled: ['---'])
       quick_options + all_options
     end
 
diff --git a/lib/core_ext/array.rb b/lib/core_ext/array.rb
index ec280ab81..2dee1d56a 100644
--- a/lib/core_ext/array.rb
+++ b/lib/core_ext/array.rb
@@ -2,4 +2,4 @@ class Array
   def include_any?(*args)
     (self & args).any?
   end
-end
\ No newline at end of file
+end
diff --git a/lib/gem_ext/builder.rb b/lib/gem_ext/builder.rb
index 8f2945040..d4ebe2efd 100644
--- a/lib/gem_ext/builder.rb
+++ b/lib/gem_ext/builder.rb
@@ -1,12 +1,14 @@
-class Builder::XmlMarkup
-  def epp_head
-    instruct!
-    epp(
-      'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
-      'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-      'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
-    ) do
-      yield
+module Builder
+  class XmlMarkup
+    def epp_head
+      instruct!
+      epp(
+        'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
+        'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
+      ) do
+        yield
+      end
     end
   end
 end
diff --git a/lib/gem_ext/paper_trail.rb b/lib/gem_ext/paper_trail.rb
index 9dec5fb12..200e71d48 100644
--- a/lib/gem_ext/paper_trail.rb
+++ b/lib/gem_ext/paper_trail.rb
@@ -8,7 +8,7 @@ end
 # Store console and rake changes in versions
 if defined?(::Rails::Console) || File.basename($PROGRAM_NAME).split(' ').first == 'spring'
   PaperTrail.whodunnit = "console-#{`whoami`.strip}"
-elsif File.basename($PROGRAM_NAME) == "rake"
+elsif File.basename($PROGRAM_NAME) == 'rake'
   # rake username does not work when spring enabled
   PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}"
 end