diff --git a/middleman-core/lib/middleman-core.rb b/middleman-core/lib/middleman-core.rb
index 41673aac..3aec5990 100644
--- a/middleman-core/lib/middleman-core.rb
+++ b/middleman-core/lib/middleman-core.rb
@@ -1,5 +1,6 @@
-# Setup our load paths
 # rubocop:disable FileName
+
+# Setup our load paths
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
index 1af54e5e..b56ab320 100644
--- a/middleman-core/lib/middleman-core/cli/build.rb
+++ b/middleman-core/lib/middleman-core/cli/build.rb
@@ -168,10 +168,10 @@ module Middleman::Cli
         path.to_s !~ /\/\./ || path.to_s =~ /\.(htaccess|htpasswd)/
       end
 
-      if RUBY_PLATFORM =~ /darwin/
-        # handle UTF-8-MAC filename on MacOS
-        @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
-      end
+      return unless RUBY_PLATFORM =~ /darwin/
+
+      # handle UTF-8-MAC filename on MacOS
+      @to_clean = @to_clean.map { |path| path.to_s.encode('UTF-8', 'UTF-8-MAC') }
     end
 
     # Actually build the app
@@ -220,14 +220,14 @@ module Middleman::Cli
 
       output_path = render_to_file(resource)
 
-      if should_clean? && output_path.exist?
-        if RUBY_PLATFORM =~ /darwin/
-          # handle UTF-8-MAC filename on MacOS
+      return unless should_clean? && output_path.exist?
 
-          @to_clean.delete(output_path.realpath.to_s.encode('UTF-8', 'UTF-8-MAC'))
-        else
-          @to_clean.delete(output_path.realpath)
-        end
+      if RUBY_PLATFORM =~ /darwin/
+        # handle UTF-8-MAC filename on MacOS
+
+        @to_clean.delete(output_path.realpath.to_s.encode('UTF-8', 'UTF-8-MAC'))
+      else
+        @to_clean.delete(output_path.realpath)
       end
     end
 
@@ -279,9 +279,7 @@ module Middleman::Cli
     end
 
     def binary_encode(string)
-      if string.respond_to?(:force_encoding)
-        string.force_encoding('ascii-8bit')
-      end
+      string.force_encoding('ascii-8bit') if string.respond_to?(:force_encoding)
       string
     end
   end
diff --git a/middleman-core/lib/middleman-core/cli/bundler.rb b/middleman-core/lib/middleman-core/cli/bundler.rb
index 3f025ef3..27e461ce 100644
--- a/middleman-core/lib/middleman-core/cli/bundler.rb
+++ b/middleman-core/lib/middleman-core/cli/bundler.rb
@@ -11,7 +11,7 @@ module Middleman::Cli
 
     # The setup task
     def bundle
-      run('bundle install')# , :capture => true)
+      run('bundle install') # , :capture => true)
     end
   end
 
@@ -27,7 +27,7 @@ module Middleman::Cli
     # The upgrade task
     def upgrade
       inside(ENV['MM_ROOT']) do
-        run('bundle update')# , :capture => true)
+        run('bundle update') # , :capture => true)
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/cli/init.rb b/middleman-core/lib/middleman-core/cli/init.rb
index 98782807..d9541161 100644
--- a/middleman-core/lib/middleman-core/cli/init.rb
+++ b/middleman-core/lib/middleman-core/cli/init.rb
@@ -15,13 +15,13 @@ module Middleman::Cli
                   default: 'default',
                   desc: "Use a project template: #{available_templates}"
     method_option 'css_dir',
-      # :default => "stylesheets",
+                  # :default => "stylesheets",
                   desc: 'The path to the css files'
     method_option 'js_dir',
-      # :default => "javascripts",
+                  # :default => "javascripts",
                   desc: 'The path to the javascript files'
     method_option 'images_dir',
-      # :default => "images",
+                  # :default => "images",
                   desc: 'The path to the image files'
     method_option 'rack',
                   type: :boolean,
diff --git a/middleman-core/lib/middleman-core/core_extensions/extensions.rb b/middleman-core/lib/middleman-core/core_extensions/extensions.rb
index 917f7f6c..28674999 100644
--- a/middleman-core/lib/middleman-core/core_extensions/extensions.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/extensions.rb
@@ -188,9 +188,7 @@ module Middleman
               logger.debug "== Extension: #{ext}"
             end
 
-            if klass.is_a?(::Middleman::Extension)
-              ::Middleman::Extension.activated_extension(klass)
-            end
+            ::Middleman::Extension.activated_extension(klass) if klass.is_a?(::Middleman::Extension)
           end
         end
       end
diff --git a/middleman-core/lib/middleman-core/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb
index e2328a02..0be0e8a1 100644
--- a/middleman-core/lib/middleman-core/core_extensions/routing.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb
@@ -2,15 +2,15 @@
 module Middleman
   module CoreExtensions
     module Routing
-        # Takes a block which allows many pages to have the same layout
-        #
-        #   with_layout :admin do
-        #     page "/admin/"
-        #     page "/admin/login.html"
-        #   end
-        #
-        # @param [String, Symbol] layout_name
-        # @return [void]
+      # Takes a block which allows many pages to have the same layout
+      #
+      #   with_layout :admin do
+      #     page "/admin/"
+      #     page "/admin/login.html"
+      #   end
+      #
+      # @param [String, Symbol] layout_name
+      # @return [void]
       def with_layout(layout_name, &block)
         old_layout = config[:layout]
 
@@ -20,14 +20,14 @@ module Middleman
         config[:layout] = old_layout
       end
 
-        # The page method allows the layout to be set on a specific path
-        #
-        #   page "/about.html", :layout => false
-        #   page "/", :layout => :homepage_layout
-        #
-        # @param [String] url
-        # @param [Hash] opts
-        # @return [void]
+      # The page method allows the layout to be set on a specific path
+      #
+      #   page "/about.html", :layout => false
+      #   page "/", :layout => :homepage_layout
+      #
+      # @param [String] url
+      # @param [Hash] opts
+      # @return [void]
       def page(url, opts={}, &block)
         blocks = Array(block)
 
diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb
index 48653bef..3a21000c 100644
--- a/middleman-core/lib/middleman-core/extension.rb
+++ b/middleman-core/lib/middleman-core/extension.rb
@@ -118,10 +118,10 @@ module Middleman
 
     def bind_before_configuration
       ext = self
-      if ext.respond_to?(:before_configuration)
-        @klass.before_configuration do
-          ext.before_configuration
-        end
+      return unless ext.respond_to?(:before_configuration)
+
+      @klass.before_configuration do
+        ext.before_configuration
       end
     end
 
@@ -139,26 +139,26 @@ module Middleman
 
     def bind_before_build
       ext = self
-      if ext.respond_to?(:before_build)
-        @klass.before_build do |builder|
-          if ext.method(:before_build).arity == 1
-            ext.before_build(builder)
-          else
-            ext.before_build
-          end
+      return unless ext.respond_to?(:before_build)
+
+      @klass.before_build do |builder|
+        if ext.method(:before_build).arity == 1
+          ext.before_build(builder)
+        else
+          ext.before_build
         end
       end
     end
 
     def bind_after_build
       ext = self
-      if ext.respond_to?(:after_build)
-        @klass.after_build do |builder|
-          if ext.method(:after_build).arity == 1
-            ext.after_build(builder)
-          else
-            ext.after_build
-          end
+      return unless ext.respond_to?(:after_build)
+
+      @klass.after_build do |builder|
+        if ext.method(:after_build).arity == 1
+          ext.after_build(builder)
+        else
+          ext.after_build
         end
       end
     end
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 41e7d5cf..d93b98a6 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -23,26 +23,25 @@ module Middleman
         logger.info "== Inspect your site configuration at http://#{host}:#{port}/__middleman/"
 
         @initialized ||= false
-        unless @initialized
-          @initialized = true
+        return if @initialized
+        @initialized = true
 
-          register_signal_handlers
+        register_signal_handlers
 
-          # Save the last-used @options so it may be re-used when
-          # reloading later on.
-          ::Middleman::Profiling.report('server_start')
+        # Save the last-used @options so it may be re-used when
+        # reloading later on.
+        ::Middleman::Profiling.report('server_start')
 
-          loop do
-            @webrick.start
+        loop do
+          @webrick.start
 
-            # $mm_shutdown is set by the signal handler
-            if $mm_shutdown
-              shutdown
-              exit
-            elsif $mm_reload
-              $mm_reload = false
-              reload
-            end
+          # $mm_shutdown is set by the signal handler
+          if $mm_shutdown
+            shutdown
+            exit
+          elsif $mm_reload
+            $mm_reload = false
+            reload
           end
         end
       end
@@ -107,9 +106,7 @@ module Middleman
             opts[:instrumenting] || false
           )
 
-          if opts[:environment]
-            config[:environment] = opts[:environment].to_sym
-          end
+          config[:environment] = opts[:environment].to_sym if opts[:environment]
         end
       end
 
@@ -153,12 +150,12 @@ module Middleman
       # @return [void]
       def register_signal_handlers
         %w(INT HUP TERM QUIT).each do |sig|
-          if Signal.list[sig]
-            Signal.trap(sig) do
-              # Do as little work as possible in the signal context
-              $mm_shutdown = true
-              @webrick.stop
-            end
+          next unless Signal.list[sig]
+
+          Signal.trap(sig) do
+            # Do as little work as possible in the signal context
+            $mm_shutdown = true
+            @webrick.stop
           end
         end
       end
@@ -234,9 +231,7 @@ module Middleman
 
     class FilteredWebrickLog < ::WEBrick::Log
       def log(level, data)
-        unless data =~ %r{Could not determine content-length of response body.}
-          super(level, data)
-        end
+        super(level, data) unless data =~ %r{Could not determine content-length of response body.}
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
index 70094b53..a9e72221 100644
--- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb
+++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
@@ -20,8 +20,8 @@ module Middleman
         # Pick a renderer
         renderer = MiddlemanRedcarpetHTML
 
-        # Support SmartyPants
         if options.delete(:smartypants)
+          # Support SmartyPants
           renderer = Class.new(renderer) do
             include ::Redcarpet::Render::SmartyPants
           end
@@ -30,9 +30,8 @@ module Middleman
         # Renderer Options
         possible_render_opts = [:filter_html, :no_images, :no_links, :no_styles, :safe_links_only, :with_toc_data, :hard_wrap, :xhtml, :prettify, :link_attributes]
 
-        render_options = possible_render_opts.reduce({}) do |sum, opt|
+        render_options = possible_render_opts.each_with_object({}) do |opt, sum|
           sum[opt] = options.delete(opt) if options.key?(opt)
-          sum
         end
 
         renderer.new(render_options)
@@ -63,7 +62,7 @@ module Middleman
         else
           link_string = link.dup
           link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
-          %Q{![#{alt_text}](#{link_string})}
+          "![#{alt_text}](#{link_string})"
         end
       end
 
@@ -76,7 +75,7 @@ module Middleman
         else
           link_string = link.dup
           link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text
-          %Q{[#{content}](#{link_string})}
+          "[#{content}](#{link_string})"
         end
       end
     end
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb b/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb
index 2c51063e..3347f373 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/on_disk.rb
@@ -57,25 +57,22 @@ module Middleman
           # whether or not it belongs in the sitemap (like a partial)
           @sitemap.rebuild_resource_list!(:touched_file)
 
-          unless waiting_for_ready || @app.build?
-            # Force sitemap rebuild so the next request is ready to go.
-            # Skip this during build because the builder will control sitemap refresh.
-            @sitemap.ensure_resource_list_updated!
-          end
+          # Force sitemap rebuild so the next request is ready to go.
+          # Skip this during build because the builder will control sitemap refresh.
+          @sitemap.ensure_resource_list_updated! unless waiting_for_ready || @app.build?
         end
 
         # Remove a file from the store
         # @param [String] file
         # @return [void]
         def remove_file(file)
-          if @file_paths_on_disk.delete?(file)
-            @sitemap.rebuild_resource_list!(:removed_file)
-            unless waiting_for_ready || @app.build?
-              # Force sitemap rebuild so the next request is ready to go.
-              # Skip this during build because the builder will control sitemap refresh.
-              @sitemap.ensure_resource_list_updated!
-            end
-          end
+          return unless @file_paths_on_disk.delete?(file)
+
+          @sitemap.rebuild_resource_list!(:removed_file)
+
+          # Force sitemap rebuild so the next request is ready to go.
+          # Skip this during build because the builder will control sitemap refresh.
+          @sitemap.ensure_resource_list_updated! unless waiting_for_ready || @app.build?
         end
 
         # Update the main sitemap resource list
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb b/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb
index ae661c90..729a6204 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb
@@ -13,15 +13,15 @@ module Middleman
 
           test_expr = parts.join('\\/')
           # A makeshift for eponymous reverse-lookup
-          found = store.resources.find { |candidate|
-              candidate.path =~ %r!^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$!
-          }
+          found = store.resources.find do |candidate|
+            candidate.path =~ %r{^#{test_expr}(?:\.[a-zA-Z0-9]+|\/)$}
+          end
 
           if found
-            return found
+            found
           else
             parts.pop if is_index
-            return store.find_resource_by_destination_path("#{parts.join('/')}/#{app.index_file}")
+            store.find_resource_by_destination_path("#{parts.join('/')}/#{app.index_file}")
           end
         end
 
@@ -75,6 +75,7 @@ module Middleman
           if !path.end_with?("/#{app.index_file}") && destination_path.end_with?("/#{app.index_file}")
             return true
           end
+
           full_path = File.join(app.source_dir, eponymous_directory_path)
           File.exist?(full_path) && File.directory?(full_path)
         end
diff --git a/middleman-core/lib/middleman-more/core_extensions/i18n.rb b/middleman-core/lib/middleman-more/core_extensions/i18n.rb
index f581f64c..0148f944 100644
--- a/middleman-core/lib/middleman-more/core_extensions/i18n.rb
+++ b/middleman-core/lib/middleman-more/core_extensions/i18n.rb
@@ -91,10 +91,10 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   private
 
   def on_file_changed(file)
-    if @locales_regex =~ file
-      @_langs = nil # Clear langs cache
-      ::I18n.reload!
-    end
+    return unless @locales_regex =~ file
+
+    @_langs = nil # Clear langs cache
+    ::I18n.reload!
   end
 
   def convert_glob_to_regex(glob)
@@ -108,10 +108,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     ::I18n.reload!
 
     ::I18n.default_locale = @mount_at_root
+
     # Reset fallbacks to fall back to our new default
-    if ::I18n.respond_to? :fallbacks
-      ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new
-    end
+    ::I18n.fallbacks = ::I18n::Locale::Fallbacks.new if ::I18n.respond_to?(:fallbacks)
   end
 
   def metadata_for_path(url)
diff --git a/middleman-core/lib/middleman-more/extensions/gzip.rb b/middleman-core/lib/middleman-more/extensions/gzip.rb
index ed875d19..77b03285 100644
--- a/middleman-core/lib/middleman-more/extensions/gzip.rb
+++ b/middleman-core/lib/middleman-more/extensions/gzip.rb
@@ -55,11 +55,11 @@ class Middleman::Extensions::Gzip < ::Middleman::Extension
     num_paths.times do
       output_filename, old_size, new_size = out_queue.pop
 
-      if output_filename
-        total_savings += (old_size - new_size)
-        size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
-        builder.say_status :gzip, "#{output_filename} (#{app.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
-      end
+      next unless output_filename
+
+      total_savings += (old_size - new_size)
+      size_change_word = (old_size - new_size) > 0 ? 'smaller' : 'larger'
+      builder.say_status :gzip, "#{output_filename} (#{app.number_to_human_size((old_size - new_size).abs)} #{size_change_word})"
     end
 
     builder.say_status :gzip, "Total gzip savings: #{app.number_to_human_size(total_savings)}", :blue