diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index b2ea7b8d9..98a1de13d 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -74,7 +74,7 @@ class EppController < ApplicationController
   # Adds error to epp_errors if element is missing or blank
   # Returns last element of selectors if it exists
   #
-  #    requires 'transfer'
+  # requires 'transfer'
   #
   # TODO: Add possibility to pass validations / options in the method
 
diff --git a/spec/epp/contact_spec.rb b/spec/epp/contact_spec.rb
index 848e92855..99ed1db81 100644
--- a/spec/epp/contact_spec.rb
+++ b/spec/epp/contact_spec.rb
@@ -341,79 +341,79 @@ describe 'EPP Contact', epp: true do
       end
 
       # it 'returns auth error for non-owner with wrong password' do
-        # @contact = Fabricate(:contact, 
-    # registrar: registrar2, code: 'info-4444', name: 'Johnny Awesome', auth_info: 'asde',
-                  # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
+      # @contact = Fabricate(:contact, 
+      # registrar: registrar2, code: 'info-4444', name: 'Johnny Awesome', auth_info: 'asde',
+      # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
 
-        # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'asdesde' } } })
-        # response = epp_plain_request(xml, :xml, :registrar1)
+      # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'asdesde' } } })
+      # response = epp_plain_request(xml, :xml, :registrar1)
 
-        # expect(response[:result_code]).to eq('2200')
-        # expect(response[:msg]).to eq('Authentication error')
+      # expect(response[:result_code]).to eq('2200')
+      # expect(response[:msg]).to eq('Authentication error')
       # end
 
       context 'about disclose' do
         # it 'discloses items with wrong password when queried by owner' do
-          # @contact = Fabricate(:contact, 
-                               # registrar: registrar1, code: 'info-4444', 
-                               # name: 'Johnny Awesome', auth_info: 'asde',
-                    # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
+        # @contact = Fabricate(:contact, 
+        # registrar: registrar1, code: 'info-4444', 
+        # name: 'Johnny Awesome', auth_info: 'asde',
+        # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
 
-          # xml = epp_xml.info({ id: { value: @contact.code } })
-          # login_as :registrar1 do
-            # response = epp_plain_request(xml, :xml)
-            # contact = response[:parsed].css('resData chkData')
+        # xml = epp_xml.info({ id: { value: @contact.code } })
+        # login_as :registrar1 do
+        # response = epp_plain_request(xml, :xml)
+        # contact = response[:parsed].css('resData chkData')
 
-            # expect(response[:result_code]).to eq('1000')
-            # expect(response[:msg]).to eq('Command completed successfully')
-            # expect(contact.css('name').first.text).to eq('Johnny Awesome')
-          # end
+        # expect(response[:result_code]).to eq('1000')
+        # expect(response[:msg]).to eq('Command completed successfully')
+        # expect(contact.css('name').first.text).to eq('Johnny Awesome')
+        # end
         # end
 
         # it 'doesn\'t disclose items to non-owner with right password' do
-          # @contact = Fabricate(:contact, registrar: registrar2, code: 'info-4444',
-                    # name: 'Johnny Awesome', auth_info: 'password',
-                    # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
+        # @contact = Fabricate(:contact, registrar: registrar2, code: 'info-4444',
+        # name: 'Johnny Awesome', auth_info: 'password',
+        # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
 
-          # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'password' } } })
-          # response = epp_plain_request(xml, :xml, :registrar1)
-          # contact = response[:parsed].css('resData chkData')
+        # xml = epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'password' } } })
+        # response = epp_plain_request(xml, :xml, :registrar1)
+        # contact = response[:parsed].css('resData chkData')
 
-          # expect(response[:result_code]).to eq('1000')
-          # expect(response[:msg]).to eq('Command completed successfully')
-          # expect(contact.css('chkData postalInfo name').first).to eq(nil)
+        # expect(response[:result_code]).to eq('1000')
+        # expect(response[:msg]).to eq('Command completed successfully')
+        # expect(contact.css('chkData postalInfo name').first).to eq(nil)
         # end
 
         # it 'discloses items to owner' do
-          # @contact = Fabricate(:contact, registrar: registrar1, code: 'info-4444', name: 'Johnny Awesome',
-                    # auth_info: 'password',
-                    # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
+        # @contact = Fabricate(:contact, registrar: registrar1, code: 'info-4444', name: 'Johnny Awesome',
+        # auth_info: 'password',
+        # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false))
 
-          # xml = epp_xml.info({ id: { value: @contact.code } })
-          # response = epp_plain_request(xml, :xml, :registrar1)
-          # contact = response[:parsed].css('resData chkData')
+        # xml = epp_xml.info({ id: { value: @contact.code } })
+        # response = epp_plain_request(xml, :xml, :registrar1)
+        # contact = response[:parsed].css('resData chkData')
 
-          # expect(response[:result_code]).to eq('1000')
-          # expect(response[:msg]).to eq('Command completed successfully')
-          # expect(contact.css('name').first.text).to eq('Johnny Awesome')
+        # expect(response[:result_code]).to eq('1000')
+        # expect(response[:msg]).to eq('Command completed successfully')
+        # expect(contact.css('name').first.text).to eq('Johnny Awesome')
         # end
 
         # it 'doesn\'t disclose private elements' do
-          # Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR', registrar: registrar2,
-                    # disclosure: Fabricate(:contact_disclosure, name: true, email: false, phone: false))
+        # Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR', registrar: registrar2,
+        # disclosure: Fabricate(:contact_disclosure, name: true, email: false, phone: false))
 
-          # xml = epp_xml.info({ id: { value: 'info-4444' }, authInfo: { pw: { value: '2fooBAR' } } })
+        # xml = epp_xml.info({ id: { value: 'info-4444' }, authInfo: { pw: { value: '2fooBAR' } } })
 
-          # response = epp_plain_request(xml, :xml, :registrar1)
-          # contact = response[:parsed].css('resData chkData')
+        # response = epp_plain_request(xml, :xml, :registrar1)
+        # contact = response[:parsed].css('resData chkData')
 
-          # expect(response[:result_code]).to eq('1000')
+        # expect(response[:result_code]).to eq('1000')
 
-          # expect(contact.css('chkData phone')).to eq(contact.css('chkData disclose phone'))
-          # expect(contact.css('chkData phone').count).to eq(1)
-          # expect(contact.css('chkData email')).to eq(contact.css('chkData disclose email'))
-          # expect(contact.css('chkData email').count).to eq(1)
-          # expect(contact.css('postalInfo name').present?).to be(true)
+        # expect(contact.css('chkData phone')).to eq(contact.css('chkData disclose phone'))
+        # expect(contact.css('chkData phone').count).to eq(1)
+        # expect(contact.css('chkData email')).to eq(contact.css('chkData disclose email'))
+        # expect(contact.css('chkData email').count).to eq(1)
+        # expect(contact.css('postalInfo name').present?).to be(true)
         # end
       end
 
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 8effd8037..0c52bc5e9 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -629,7 +629,8 @@ describe 'EPP Domain', epp: true do
         })
 
       response = epp_plain_request(xml, :xml)
-      response[:msg].should == 'Mutually exclusive parameters: extension > create > keyData, extension > create > dsData'
+      response[:msg].should == 'Mutually exclusive parameters: extension > create > keyData, '\
+      'extension > create > dsData'
       response[:result_code].should == '2306'
     end
   end
diff --git a/spec/epp/keyrelay_spec.rb b/spec/epp/keyrelay_spec.rb
index 256e46c1d..20fcf2d8a 100644
--- a/spec/epp/keyrelay_spec.rb
+++ b/spec/epp/keyrelay_spec.rb
@@ -163,7 +163,8 @@ describe 'EPP Keyrelay', epp: true do
     })
 
     response = epp_request(xml, :xml, :elkdata)
-    response[:msg].should == 'Exactly one parameter required: keyrelay > expiry > relative OR keyrelay > expiry > absolute'
+    response[:msg].should == 'Exactly one parameter required: keyrelay > expiry > relative OR '\
+    'keyrelay > expiry > absolute'
 
     @zone.messages.queued.count.should == msg_count
   end
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index bf89eb6ea..d4a1e9e37 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -58,16 +58,16 @@ describe Contact do
     end
 
     # it 'ico should be valid' do
-      # @contact.ident_type = 'ico'
-      # @contact.ident = '1234'
-      # @contact.errors.full_messages.should match_array([])
+    # @contact.ident_type = 'ico'
+    # @contact.ident = '1234'
+    # @contact.errors.full_messages.should match_array([])
     # end
 
     # it 'ident should return false' do
-      # puts @contact.ident_type
-      # @contact.ident = '123abc'
-      # @contact.valid?
-      # @contact.errors.full_messages.should_not == []
+    # puts @contact.ident_type
+    # @contact.ident = '123abc'
+    # @contact.valid?
+    # @contact.errors.full_messages.should_not == []
     # end
 
     context 'as birthday' do
@@ -176,17 +176,17 @@ end
 
 # TODO: investigate it a bit more
 # describe Contact, '#relations_with_domain?' do
-  # context 'with relation' do
-    # before :all do
-      # create_settings
-      # Fabricate(:domain)
-      # @contact = Fabricate(:contact)
-    # end
+# context 'with relation' do
+# before :all do
+# create_settings
+# Fabricate(:domain)
+# @contact = Fabricate(:contact)
+# end
 
-    # it 'should have relation with domain' do
-      # @contact.relations_with_domain?.should == true
-    # end
-  # end
+# it 'should have relation with domain' do
+# @contact.relations_with_domain?.should == true
+# end
+# end
 # end
 
 describe Contact, '.extract_params' do
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 733ce22f6..800db928c 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -16,50 +16,50 @@ describe Domain do
     end
 
     # it 'validates domain name', skip: true do
-      # d = Fabricate(:domain)
-      # expect(d.name).to_not be_nil
+    # d = Fabricate(:domain)
+    # expect(d.name).to_not be_nil
 
-      # invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee',
-                 # 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', '  .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee']
+    # invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee',
+    # 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', '  .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee']
 
-      # invalid.each do |x|
-        # expect(Fabricate.build(:domain, name: x).valid?).to be false
-      # end
+    # invalid.each do |x|
+    # expect(Fabricate.build(:domain, name: x).valid?).to be false
+    # end
 
-      # valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee',
-               # 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', '  ŽŠ.ee  ']
+    # valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee',
+    # 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', '  ŽŠ.ee  ']
 
-      # valid.each do |x|
-        # expect(Fabricate.build(:domain, name: x).valid?).to be true
-      # end
+    # valid.each do |x|
+    # expect(Fabricate.build(:domain, name: x).valid?).to be true
+    # end
 
-      # invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee']
+    # invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee']
 
-      # invalid_punycode.each do |x|
-        # expect(Fabricate.build(:domain, name: x).valid?).to be false
-      # end
+    # invalid_punycode.each do |x|
+    # expect(Fabricate.build(:domain, name: x).valid?).to be false
+    # end
 
-      # valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee']
+    # valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee']
 
-      # valid_punycode.each do |x|
-        # expect(Fabricate.build(:domain, name: x).valid?).to be true
-      # end
+    # valid_punycode.each do |x|
+    # expect(Fabricate.build(:domain, name: x).valid?).to be true
+    # end
 
-      # d = Domain.new
-      # expect(d.valid?).to be false
-      # expect(d.errors.messages).to match_array({
-        # owner_contact: ['Registrant is missing'],
-        # admin_contacts: ['Admin contacts count must be between 1 - infinity'],
-        # nameservers: ['Nameservers count must be between 2-11'],
-        # registrar: ['Registrar is missing'],
-        # period: ['Period is not a number']
-      # })
+    # d = Domain.new
+    # expect(d.valid?).to be false
+    # expect(d.errors.messages).to match_array({
+    # owner_contact: ['Registrant is missing'],
+    # admin_contacts: ['Admin contacts count must be between 1 - infinity'],
+    # nameservers: ['Nameservers count must be between 2-11'],
+    # registrar: ['Registrar is missing'],
+    # period: ['Period is not a number']
+    # })
 
-      # Setting.ns_min_count = 2
-      # Setting.ns_max_count = 7
+    # Setting.ns_min_count = 2
+    # Setting.ns_max_count = 7
 
-      # expect(d.valid?).to be false
-      # expect(d.errors.messages[:nameservers]).to eq(['Nameservers count must be between 2-7'])
+    # expect(d.valid?).to be false
+    # expect(d.errors.messages[:nameservers]).to eq(['Nameservers count must be between 2-7'])
     # end
 
     it 'downcases domain' do