diff --git a/lib/rackstash/message.rb b/lib/rackstash/message.rb
index eb7fefa..b52e93f 100644
--- a/lib/rackstash/message.rb
+++ b/lib/rackstash/message.rb
@@ -96,7 +96,7 @@ module Rackstash
         if block_given?
           copy_with @message.gsub(pattern, &block).freeze
         else
-          return enum_for(__method__)
+          enum_for(__method__)
         end
       else
         copy_with @message.gsub(pattern, replacement, &block).freeze
diff --git a/spec/rackstash/adapters/logger_spec.rb b/spec/rackstash/adapters/logger_spec.rb
index e34ae84..38c6fbe 100644
--- a/spec/rackstash/adapters/logger_spec.rb
+++ b/spec/rackstash/adapters/logger_spec.rb
@@ -27,6 +27,7 @@ describe Rackstash::Adapters::Logger do
       end
     end.new([])
   }
+
   let(:logger) {
     ::Logger.new(bucket).tap do |logger|
       logger.formatter = ->(_severity, _time, _progname, msg) { msg }
@@ -35,7 +36,8 @@ describe Rackstash::Adapters::Logger do
       def logger.reopen
       end
     end
-   }
+  }
+
   let(:logger_ducky) {
     Object.new.tap do |duck|
       allow(duck).to receive(:add)
diff --git a/spec/rackstash/buffer_spec.rb b/spec/rackstash/buffer_spec.rb
index 63dc20d..3aeb2d6 100644
--- a/spec/rackstash/buffer_spec.rb
+++ b/spec/rackstash/buffer_spec.rb
@@ -161,7 +161,7 @@ describe Rackstash::Buffer do
     end
 
     it 'returns the given value' do
-      fields = {key: 'value'}
+      fields = { key: 'value' }
       expect(buffer.add_fields(fields)).to equal fields
     end
   end
diff --git a/spec/rackstash/encoders/helpers/timestamp_spec.rb b/spec/rackstash/encoders/helpers/timestamp_spec.rb
index 2ff40ec..74bb34c 100644
--- a/spec/rackstash/encoders/helpers/timestamp_spec.rb
+++ b/spec/rackstash/encoders/helpers/timestamp_spec.rb
@@ -24,12 +24,14 @@ describe Rackstash::Encoders::Helpers::Timestamp do
   describe '#normalize_timestamp' do
     it 'formats a Time object' do
       event['@timestamp'] = Time.parse('2016-10-17 13:37:00 +03:00')
-      expect(helper.normalize_timestamp(event).fetch('@timestamp')).to eql '2016-10-17T10:37:00.000000Z'
+      expect(helper.normalize_timestamp(event).fetch('@timestamp'))
+        .to eql '2016-10-17T10:37:00.000000Z'
     end
 
     it 'formats a DateTime object' do
       event['@timestamp'] = DateTime.parse('2016-10-17 13:37:00 +03:00')
-      expect(helper.normalize_timestamp(event).fetch('@timestamp')).to eql '2016-10-17T10:37:00.000000Z'
+      expect(helper.normalize_timestamp(event).fetch('@timestamp'))
+        .to eql '2016-10-17T10:37:00.000000Z'
     end
 
     it 'ignores an unset value' do
@@ -51,10 +53,10 @@ describe Rackstash::Encoders::Helpers::Timestamp do
       event['@timestamp'] = Time.parse('2016-10-17 13:37:00 +03:00')
       event['custom'] = Time.parse('2016-10-17 20:42:00 +07:00')
 
-      expect(helper.normalize_timestamp(event, field: 'custom')).to match({
+      expect(helper.normalize_timestamp(event, field: 'custom')).to match(
         '@timestamp' => instance_of(Time),
         'custom' => '2016-10-17T13:42:00.000000Z'
-      })
+      )
     end
   end
 end
diff --git a/spec/rackstash/encoders/json_spec.rb b/spec/rackstash/encoders/json_spec.rb
index ebb9a76..56933ba 100644
--- a/spec/rackstash/encoders/json_spec.rb
+++ b/spec/rackstash/encoders/json_spec.rb
@@ -14,7 +14,7 @@ describe Rackstash::Encoders::JSON do
 
   describe '#encode' do
     it 'formats the passed event hash as a JSON string' do
-      event = { 'hello' => 'world', 'message' => ["hello\n", "world"] }
+      event = { 'hello' => 'world', 'message' => ["hello\n", 'world'] }
       expect(encoder.encode(event)).to eql '{"hello":"world","message":"hello\nworld"}'
     end
 
diff --git a/spec/rackstash/encoders/logstash_spec.rb b/spec/rackstash/encoders/logstash_spec.rb
index 105eb57..dbdf22d 100644
--- a/spec/rackstash/encoders/logstash_spec.rb
+++ b/spec/rackstash/encoders/logstash_spec.rb
@@ -14,7 +14,7 @@ describe Rackstash::Encoders::Logstash do
 
   describe '#encode' do
     it 'formats the passed event hash as a JSON string and includes @version' do
-      event = { 'hello' => 'world', 'message' => ["hello\n", "world"] }
+      event = { 'hello' => 'world', 'message' => ["hello\n", 'world'] }
       expect(encoder.encode(event))
         .to match(/\A\{"hello":"world","message":"hello\\nworld","@version":"1","@timestamp":"\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{6}Z"\}\z/)
     end
diff --git a/spec/rackstash/fields/abstract_collection_spec.rb b/spec/rackstash/fields/abstract_collection_spec.rb
index ea4464a..611b6be 100644
--- a/spec/rackstash/fields/abstract_collection_spec.rb
+++ b/spec/rackstash/fields/abstract_collection_spec.rb
@@ -268,7 +268,7 @@ describe Rackstash::Fields::AbstractCollection do
           test_self = self
 
           hash = {
-            beep: ->(v) {
+            beep: lambda { |v|
               expect(self).to equal test_self
               { v.upcase => -> { self } }
             }
diff --git a/spec/rackstash/filters/clear_color_spec.rb b/spec/rackstash/filters/clear_color_spec.rb
index e423855..cd09c22 100644
--- a/spec/rackstash/filters/clear_color_spec.rb
+++ b/spec/rackstash/filters/clear_color_spec.rb
@@ -19,10 +19,10 @@ describe Rackstash::Filters::ClearColor do
 
   it 'removes color codes from a message array' do
     event = {
-      'message' => ["Some \e[31mred\e[0m\nand", "some \e[32mgreen\e[0m text" ]
+      'message' => ["Some \e[31mred\e[0m\nand", "some \e[32mgreen\e[0m text"]
     }
     expect(filter.call(event)).to eql 'message' => [
-      "Some red\nand", "some green text"
+      "Some red\nand", 'some green text'
     ]
   end
 
@@ -30,5 +30,4 @@ describe Rackstash::Filters::ClearColor do
     event = { 'foo' => 'bar' }
     expect(filter.call(event)).to eql 'foo' => 'bar'
   end
-
 end
diff --git a/spec/rackstash/filters/replace_spec.rb b/spec/rackstash/filters/replace_spec.rb
index 9d5680f..aaae562 100644
--- a/spec/rackstash/filters/replace_spec.rb
+++ b/spec/rackstash/filters/replace_spec.rb
@@ -22,17 +22,17 @@ describe Rackstash::Filters::Replace do
   end
 
   it 'sets evaluated values from callable objects' do
-    filter!('foo' => ->(event) { event['foo'].upcase } )
+    filter!('foo' => ->(event) { event['foo'].upcase })
     expect(event).to eql 'foo' => 'FOO VALUE', 'bar' => 'bar value'
   end
 
   it 'sets raw values' do
-    filter!('bar' => 123 )
+    filter!('bar' => 123)
     expect(event).to eql 'foo' => 'foo value', 'bar' => 123
   end
 
   it 'always sets fields' do
-    filter!('baz' => 42, 'boing' => ->(event) { 'quark' })
+    filter!('baz' => 42, 'boing' => ->(_event) { 'quark' })
     expect(event).to eql(
       'foo' => 'foo value',
       'bar' => 'bar value',
@@ -42,7 +42,7 @@ describe Rackstash::Filters::Replace do
   end
 
   it 'stringifies keys' do
-    filter!(foo: ->(event) { event['foo'].upcase } )
+    filter!(foo: ->(event) { event['foo'].upcase })
     expect(event).to eql 'foo' => 'FOO VALUE', 'bar' => 'bar value'
   end
 
diff --git a/spec/rackstash/filters/truncate_message_spec.rb b/spec/rackstash/filters/truncate_message_spec.rb
index aff8ac1..4da2b9f 100644
--- a/spec/rackstash/filters/truncate_message_spec.rb
+++ b/spec/rackstash/filters/truncate_message_spec.rb
@@ -37,23 +37,23 @@ describe Rackstash::Filters::TruncateMessage do
   describe '#call' do
     context 'with selectors' do
       it 'calls all selectors' do
-        selector_1 = ->(message) { true }
-        selector_2 = callable { true }
-        args[:selectors] = [selector_1, selector_2]
+        selector1 = ->(_message) { true }
+        selector2 = callable { true }
+        args[:selectors] = [selector1, selector2]
 
-        # selector_1 is a proc and is thus passed directly as a block to select!
-        expect(selector_2).to receive(:call).exactly(messages.count)
+        # selector1 is a proc and is thus passed directly as a block to select!
+        expect(selector2).to receive(:call).exactly(messages.count)
 
         filter.call(event)
       end
 
       it 'stops on goal' do
-        selector_1 = callable { false }
-        selector_2 = callable { true }
-        args[:selectors] = [selector_1, selector_2]
+        selector1 = callable { false }
+        selector2 = callable { true }
+        args[:selectors] = [selector1, selector2]
 
-        expect(selector_1).to receive(:call).exactly(3).times.and_call_original
-        expect(selector_2).not_to receive(:call)
+        expect(selector1).to receive(:call).exactly(3).times.and_call_original
+        expect(selector2).not_to receive(:call)
 
         filter.call(event)
         expect(messages).to be_empty
diff --git a/spec/rackstash/filters/update_spec.rb b/spec/rackstash/filters/update_spec.rb
index e8011f5..ddac2d2 100644
--- a/spec/rackstash/filters/update_spec.rb
+++ b/spec/rackstash/filters/update_spec.rb
@@ -22,17 +22,17 @@ describe Rackstash::Filters::Update do
   end
 
   it 'sets evaluated values from callable objects' do
-    filter!('foo' => ->(event) { event['foo'].upcase } )
+    filter!('foo' => ->(event) { event['foo'].upcase })
     expect(event).to eql 'foo' => 'FOO VALUE', 'bar' => 'bar value'
   end
 
   it 'sets raw values' do
-    filter!('bar' => 123 )
+    filter!('bar' => 123)
     expect(event).to eql 'foo' => 'foo value', 'bar' => 123
   end
 
   it 'ignores missing fields' do
-    spec = {'baz' => 42, 'boing' => ->(event) { 'quark' }}
+    spec = { 'baz' => 42, 'boing' => ->(_event) { 'quark' } }
     expect(spec['boing']).not_to receive(:call)
 
     filter!(spec)
@@ -43,7 +43,7 @@ describe Rackstash::Filters::Update do
   end
 
   it 'stringifies keys' do
-    filter!(foo: ->(event) { event['foo'].upcase } )
+    filter!(foo: ->(event) { event['foo'].upcase })
     expect(event).to eql 'foo' => 'FOO VALUE', 'bar' => 'bar value'
   end
 
diff --git a/spec/rackstash/formatter_spec.rb b/spec/rackstash/formatter_spec.rb
index ec742bb..781af8a 100644
--- a/spec/rackstash/formatter_spec.rb
+++ b/spec/rackstash/formatter_spec.rb
@@ -29,7 +29,6 @@ describe Rackstash::Formatter do
     expect(formatter.call('ERROR', Time.now, 'progname', [1, 'y']))
       .to eql("[1, \"y\"]\n")
       .and be_frozen
-
   end
 
   it 'formats exceptions' do
@@ -47,7 +46,7 @@ describe Rackstash::Formatter do
     expect(formatter.call('ERROR', Time.now, 'progname', exception))
       .to match(checker)
       .and be_frozen
-    end
+  end
 
   it 'inspects unknown objects' do
     object = Object.new
diff --git a/spec/rackstash/message_spec.rb b/spec/rackstash/message_spec.rb
index 34286d7..27c7a49 100644
--- a/spec/rackstash/message_spec.rb
+++ b/spec/rackstash/message_spec.rb
@@ -91,8 +91,8 @@ describe Rackstash::Message do
 
   describe '#gsub' do
     it 'can perform simple replaces' do
-      expect(message.gsub(/s/, 'S')).to be_a described_class
-      expect(message.gsub(/s/, 'S').to_s).to eql 'meSSage'
+      expect(message.gsub(/ss/, 'SS')).to be_a described_class
+      expect(message.gsub(/ss/, 'SS').to_s).to eql 'meSSage'
     end
 
     it 'can perform replaces with a block' do
@@ -108,8 +108,8 @@ describe Rackstash::Message do
 
   describe '#sub' do
     it 'can perform simple replaces' do
-      expect(message.sub(/s/, 'S')).to be_a described_class
-      expect(message.sub(/s/, 'S').to_s).to eql 'meSsage'
+      expect(message.sub(/ss/, 'SS')).to be_a described_class
+      expect(message.sub(/ss/, 'SS').to_s).to eql 'meSSage'
     end
 
     it 'can perform replaces with a block' do
@@ -158,7 +158,6 @@ describe Rackstash::Message do
     end
   end
 
-
   describe '#message' do
     it 'is aliased to to_str' do
       message = described_class.new('hello world')