diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index ad8a3395f..6c5d8f103 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -165,7 +165,6 @@ module Jekyll
 
     # Conditional optimizations
     Jekyll::External.require_if_present('liquid-c')
-
   end
 end
 
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index f3c89dfd2..afe72a5b4 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -1,8 +1,6 @@
 module Jekyll
   class Command
-
     class << self
-
       # A list of subclasses of Jekyll::Command
       def subclasses
         @subclasses ||= []
@@ -62,8 +60,6 @@ module Jekyll
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
         c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.'
       end
-
     end
-
   end
 end
diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
index de0cc8bca..b75194efe 100644
--- a/lib/jekyll/commands/build.rb
+++ b/lib/jekyll/commands/build.rb
@@ -1,9 +1,7 @@
 module Jekyll
   module Commands
     class Build < Command
-
       class << self
-
         # Create the Mercenary command for the Jekyll CLI for this Command
         def init_with_program(prog)
           prog.command(:build) do |c|
@@ -71,9 +69,7 @@ module Jekyll
           External.require_with_graceful_fail 'jekyll-watch'
           Jekyll::Watcher.watch(options)
         end
-
       end # end of class << self
-
     end
   end
 end
diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb
index 94f9bf978..b7f9a9539 100644
--- a/lib/jekyll/commands/clean.rb
+++ b/lib/jekyll/commands/clean.rb
@@ -2,7 +2,6 @@ module Jekyll
   module Commands
     class Clean < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:clean) do |c|
             c.syntax 'clean [subcommand]'
@@ -37,7 +36,6 @@ module Jekyll
             Jekyll.logger.info "Nothing to do for #{metadata_file}."
           end
         end
-
       end
     end
   end
diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb
index 953c2623a..ba98e6539 100644
--- a/lib/jekyll/commands/doctor.rb
+++ b/lib/jekyll/commands/doctor.rb
@@ -2,7 +2,6 @@ module Jekyll
   module Commands
     class Doctor < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:doctor) do |c|
             c.syntax 'doctor'
@@ -108,7 +107,6 @@ module Jekyll
           end
         end
       end
-
     end
   end
 end
diff --git a/lib/jekyll/commands/help.rb b/lib/jekyll/commands/help.rb
index 421d87e58..01bf32801 100644
--- a/lib/jekyll/commands/help.rb
+++ b/lib/jekyll/commands/help.rb
@@ -2,7 +2,6 @@ module Jekyll
   module Commands
     class Help < Command
       class << self
-
         def init_with_program(prog)
           prog.command(:help) do |c|
             c.syntax 'help [subcommand]'
@@ -26,7 +25,6 @@ module Jekyll
           Jekyll.logger.error "Error:", "Hmm... we don't know what the '#{cmd}' command is."
           Jekyll.logger.info  "Valid commands:", prog.commands.keys.join(", ")
         end
-
       end
     end
   end
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index a2e5e381a..f8ecd3ed3 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -2,7 +2,6 @@
 
 module Jekyll
   class Configuration < Hash
-
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
     DEFAULTS = Configuration[{
diff --git a/lib/jekyll/converters/markdown/redcarpet_parser.rb b/lib/jekyll/converters/markdown/redcarpet_parser.rb
index 7f5adcee0..8378cb5de 100644
--- a/lib/jekyll/converters/markdown/redcarpet_parser.rb
+++ b/lib/jekyll/converters/markdown/redcarpet_parser.rb
@@ -2,7 +2,6 @@ module Jekyll
   module Converters
     class Markdown
       class RedcarpetParser
-
         module CommonMethods
           def add_code_tags(code, lang)
             code = code.to_s
diff --git a/lib/jekyll/drops/collection_drop.rb b/lib/jekyll/drops/collection_drop.rb
index 269132304..5f5025b1f 100644
--- a/lib/jekyll/drops/collection_drop.rb
+++ b/lib/jekyll/drops/collection_drop.rb
@@ -17,7 +17,6 @@ module Jekyll
 
       private
       def_delegator :@obj, :metadata, :fallback_data
-
     end
   end
 end
diff --git a/lib/jekyll/drops/document_drop.rb b/lib/jekyll/drops/document_drop.rb
index f6e03fec5..69933752b 100644
--- a/lib/jekyll/drops/document_drop.rb
+++ b/lib/jekyll/drops/document_drop.rb
@@ -22,7 +22,6 @@ module Jekyll
 
       private
       def_delegator :@obj, :data, :fallback_data
-
     end
   end
 end
diff --git a/lib/jekyll/drops/drop.rb b/lib/jekyll/drops/drop.rb
index 23237a081..2ad107e8e 100644
--- a/lib/jekyll/drops/drop.rb
+++ b/lib/jekyll/drops/drop.rb
@@ -135,7 +135,6 @@ module Jekyll
       def each_key(&block)
         keys.each(&block)
       end
-
     end
   end
 end
diff --git a/lib/jekyll/drops/site_drop.rb b/lib/jekyll/drops/site_drop.rb
index ec4f09101..4d07ebe8f 100644
--- a/lib/jekyll/drops/site_drop.rb
+++ b/lib/jekyll/drops/site_drop.rb
@@ -33,7 +33,6 @@ module Jekyll
 
       private
       def_delegator :@obj, :config, :fallback_data
-
     end
   end
 end
diff --git a/lib/jekyll/drops/unified_payload_drop.rb b/lib/jekyll/drops/unified_payload_drop.rb
index 26b9104b6..b642bda26 100644
--- a/lib/jekyll/drops/unified_payload_drop.rb
+++ b/lib/jekyll/drops/unified_payload_drop.rb
@@ -20,7 +20,6 @@ module Jekyll
       def fallback_data
         @fallback_data ||= {}
       end
-
     end
   end
 end
diff --git a/lib/jekyll/external.rb b/lib/jekyll/external.rb
index 812480516..d213364bb 100644
--- a/lib/jekyll/external.rb
+++ b/lib/jekyll/external.rb
@@ -1,7 +1,6 @@
 module Jekyll
   module External
     class << self
-
       #
       # Gems that, if installed, should be loaded.
       # Usually contain subcommands.
@@ -54,7 +53,6 @@ If you run into trouble, you can find helpful resources at http://jekyllrb.com/h
           end
         end
       end
-
     end
   end
 end
diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index da7bf1215..d4ad99515 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -91,6 +91,5 @@ module Jekyll
           "Ensure you have `gems: [jekyll-paginate]` in your configuration file."
       end
     end
-
   end
 end
diff --git a/lib/jekyll/readers/collection_reader.rb b/lib/jekyll/readers/collection_reader.rb
index 8d5225512..062be42a4 100644
--- a/lib/jekyll/readers/collection_reader.rb
+++ b/lib/jekyll/readers/collection_reader.rb
@@ -16,6 +16,5 @@ module Jekyll
         collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
       end
     end
-
   end
 end
diff --git a/lib/jekyll/related_posts.rb b/lib/jekyll/related_posts.rb
index fbc2837bf..eb57a7fc9 100644
--- a/lib/jekyll/related_posts.rb
+++ b/lib/jekyll/related_posts.rb
@@ -1,6 +1,5 @@
 module Jekyll
   class RelatedPosts
-
     class << self
       attr_accessor :lsi
     end
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index f7bfed3dc..f9c1b88c6 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -2,7 +2,6 @@
 
 module Jekyll
   class Renderer
-
     attr_reader :document, :site, :payload
 
     def initialize(site, document, site_payload = nil)
@@ -161,6 +160,5 @@ module Jekyll
 
       output
     end
-
   end
 end
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index a487b4042..0a5b790bd 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -115,7 +115,6 @@ eos
         ].join(" ")
         "<figure class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></figure>"
       end
-
     end
   end
 end
diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb
index 4152e7efe..c8f08a6c1 100644
--- a/lib/jekyll/tags/include.rb
+++ b/lib/jekyll/tags/include.rb
@@ -12,7 +12,6 @@ module Jekyll
     end
 
     class IncludeTag < Liquid::Tag
-
       attr_reader :includes_dir
 
       VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 3f00cfd33..367872c0a 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -11,7 +11,6 @@ require 'uri'
 #
 module Jekyll
   class URL
-
     # options - One of :permalink or :template must be supplied.
     #           :template     - The String used as template for URL generation,
     #                           for example "/:path/:basename:output_ext", where