diff --git a/.rubocop_rubyzip.yml b/.rubocop_rubyzip.yml
index a111158..997dc12 100644
--- a/.rubocop_rubyzip.yml
+++ b/.rubocop_rubyzip.yml
@@ -110,12 +110,6 @@ Style/ElseAlignment:
 Style/EmptyElse:
   Enabled: false
 
-# Offense count: 40
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
 # Offense count: 4
 # Cop supports --auto-correct.
 Style/EmptyLinesAroundMethodBody:
diff --git a/lib/zip/deflater.rb b/lib/zip/deflater.rb
index 60ad215..01248f0 100755
--- a/lib/zip/deflater.rb
+++ b/lib/zip/deflater.rb
@@ -1,6 +1,5 @@
 module Zip
   class Deflater < Compressor #:nodoc:all
-
     def initialize(output_stream, level = Zip.default_compression, encrypter = NullEncrypter.new)
       super()
       @output_stream = output_stream
diff --git a/lib/zip/dos_time.rb b/lib/zip/dos_time.rb
index fb36cb8..65cfa0c 100755
--- a/lib/zip/dos_time.rb
+++ b/lib/zip/dos_time.rb
@@ -1,6 +1,5 @@
 module Zip
   class DOSTime < Time #:nodoc:all
-
     #MS-DOS File Date and Time format as used in Interrupt 21H Function 57H:
 
     # Register CX, the Time:
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
index 62bd064..464889b 100755
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -198,7 +198,6 @@ module Zip
       rescue Error
         nil
       end
-
     end
 
     public
@@ -686,7 +685,6 @@ module Zip
         end
       end
     end
-
   end
 end
 
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
index cc28afb..eb4eb14 100755
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -43,7 +43,6 @@ module Zip
   # interface for accessing the filesystem, ie. the File and Dir classes.
 
   class File < CentralDirectory
-
     CREATE               = 1
     SPLIT_SIGNATURE      = 0x08074b50
     ZIP64_EOCD_SIGNATURE = 0x06064b50
@@ -426,7 +425,6 @@ module Zip
       temp_file.binmode
       temp_file
     end
-
   end
 end
 
diff --git a/lib/zip/filesystem.rb b/lib/zip/filesystem.rb
index 16f82bc..580fd0a 100755
--- a/lib/zip/filesystem.rb
+++ b/lib/zip/filesystem.rb
@@ -65,14 +65,11 @@ module Zip
     # The individual methods are not documented due to their
     # similarity with the methods in File
     class ZipFsFile
-
       attr_writer :dir
 #      protected :dir
 
       class ZipFsStat
-
         class << self
-
           def delegate_to_fs_file(*methods)
             methods.each do |method|
               self.class_eval <<-end_eval, __FILE__, __LINE__ + 1
@@ -82,7 +79,6 @@ module Zip
               end_eval
             end
           end
-
         end
 
         def initialize(zipFsFile, entryName)
@@ -430,7 +426,6 @@ module Zip
     # The individual methods are not documented due to their
     # similarity with the methods in Dir
     class ZipFsDir
-
       def initialize(mappedZip)
         @mappedZip = mappedZip
       end
@@ -504,7 +499,6 @@ module Zip
       def chroot(*_args)
         raise NotImplementedError, "The chroot() function is not implemented"
       end
-
     end
 
     class ZipFsDirIterator # :nodoc:all
diff --git a/lib/zip/output_stream.rb b/lib/zip/output_stream.rb
index c5a8ee6..90f2fa2 100755
--- a/lib/zip/output_stream.rb
+++ b/lib/zip/output_stream.rb
@@ -181,7 +181,6 @@ module Zip
       @compressor << data
       self
     end
-
   end
 end
 
diff --git a/lib/zip/pass_thru_decompressor.rb b/lib/zip/pass_thru_decompressor.rb
index 8c0b42e..2b3500a 100755
--- a/lib/zip/pass_thru_decompressor.rb
+++ b/lib/zip/pass_thru_decompressor.rb
@@ -1,6 +1,5 @@
 module Zip
   class PassThruDecompressor < Decompressor  #:nodoc:all
-
     def initialize(input_stream, chars_to_read)
       super(input_stream)
       @chars_to_read = chars_to_read
diff --git a/samples/example_recursive.rb b/samples/example_recursive.rb
index fb5d183..72ee7c8 100644
--- a/samples/example_recursive.rb
+++ b/samples/example_recursive.rb
@@ -11,7 +11,6 @@ require 'zip'
 #   zf = ZipFileGenerator.new(directoryToZip, outputFile)
 #   zf.write()
 class ZipFileGenerator
-
   # Initialize with the directory to zip and the location of the output archive.
   def initialize(inputDir, outputFile)
     @inputDir = inputDir
@@ -46,5 +45,4 @@ class ZipFileGenerator
       end
     end
   end
-
 end
diff --git a/samples/qtzip.rb b/samples/qtzip.rb
index ee3f0ae..1aac599 100755
--- a/samples/qtzip.rb
+++ b/samples/qtzip.rb
@@ -12,7 +12,6 @@ require 'zip'
 a = Qt::Application.new(ARGV)
 
 class ZipDialog < ZipDialogUI
-
   def initialize
     super()
     connect(child('add_button'), SIGNAL('clicked()'),
diff --git a/test/basic_zip_file_test.rb b/test/basic_zip_file_test.rb
index 44754c8..d568a10 100644
--- a/test/basic_zip_file_test.rb
+++ b/test/basic_zip_file_test.rb
@@ -57,5 +57,4 @@ class BasicZipFileTest < MiniTest::Test
                                     fileAndEntryName)
     end
   end
-
 end
diff --git a/test/central_directory_entry_test.rb b/test/central_directory_entry_test.rb
index f2c008f..93d793a 100644
--- a/test/central_directory_entry_test.rb
+++ b/test/central_directory_entry_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ZipCentralDirectoryEntryTest < MiniTest::Test
-
   def test_read_from_stream
     File.open("test/data/testDirectory.bin", "rb") do  |file|
       entry = ::Zip::Entry.read_c_dir_entry(file)
@@ -67,5 +66,4 @@ class ZipCentralDirectoryEntryTest < MiniTest::Test
     fail "ZipError expected"
   rescue ::Zip::Error
   end
-
 end
diff --git a/test/central_directory_test.rb b/test/central_directory_test.rb
index c2e89f1..6bcf69f 100644
--- a/test/central_directory_test.rb
+++ b/test/central_directory_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ZipCentralDirectoryTest < MiniTest::Test
-
   def teardown
     ::Zip.reset!
   end
diff --git a/test/entry_test.rb b/test/entry_test.rb
index d548df8..8915ad0 100644
--- a/test/entry_test.rb
+++ b/test/entry_test.rb
@@ -160,5 +160,4 @@ class ZipEntryTest < MiniTest::Test
 
     assert_match(/mimetypeapplication\/epub\+zip/, first_100_bytes)
   end
-
 end
diff --git a/test/errors_test.rb b/test/errors_test.rb
index df877d9..a65a3af 100644
--- a/test/errors_test.rb
+++ b/test/errors_test.rb
@@ -2,7 +2,6 @@
 require 'test_helper'
 
 class ErrorsTest < MiniTest::Test
-
   def test_rescue_legacy_zip_error
     raise ::Zip::Error
   rescue ::Zip::ZipError
@@ -32,5 +31,4 @@ class ErrorsTest < MiniTest::Test
     raise ::Zip::InternalError
   rescue ::Zip::ZipInternalError
   end
-
 end
diff --git a/test/extra_field_test.rb b/test/extra_field_test.rb
index a3e9905..fbdd9f4 100644
--- a/test/extra_field_test.rb
+++ b/test/extra_field_test.rb
@@ -73,5 +73,4 @@ class ZipExtraFieldTest < MiniTest::Test
     extra1.create("IUnix")
     assert_equal(extra1, extra3)
   end
-
 end
diff --git a/test/file_extract_test.rb b/test/file_extract_test.rb
index 7f2cb42..86cf2e3 100644
--- a/test/file_extract_test.rb
+++ b/test/file_extract_test.rb
@@ -80,5 +80,4 @@ class ZipFileExtractTest < MiniTest::Test
     end
     assert(!File.exist?(outFile))
   end
-
 end
diff --git a/test/filesystem/dir_iterator_test.rb b/test/filesystem/dir_iterator_test.rb
index 8c31529..cde92d9 100644
--- a/test/filesystem/dir_iterator_test.rb
+++ b/test/filesystem/dir_iterator_test.rb
@@ -2,7 +2,6 @@ require 'test_helper'
 require 'zip/filesystem'
 
 class ZipFsDirIteratorTest < MiniTest::Test
-
   FILENAME_ARRAY = %w(f1 f2 f3 f4 f5 f6)
 
   def setup
@@ -57,5 +56,4 @@ class ZipFsDirIteratorTest < MiniTest::Test
     @dirIt.seek(pos)
     assert_equal(valAtPos, @dirIt.read)
   end
-
 end
diff --git a/test/filesystem/directory_test.rb b/test/filesystem/directory_test.rb
index f56f716..9c50f33 100644
--- a/test/filesystem/directory_test.rb
+++ b/test/filesystem/directory_test.rb
@@ -118,5 +118,4 @@ class ZipFsDirectoryTest < MiniTest::Test
       end
     end
   end
-
 end
diff --git a/test/filesystem/file_mutating_test.rb b/test/filesystem/file_mutating_test.rb
index 51207ad..34fe2c7 100644
--- a/test/filesystem/file_mutating_test.rb
+++ b/test/filesystem/file_mutating_test.rb
@@ -85,5 +85,4 @@ class ZipFsFileMutatingTest < MiniTest::Test
       assert(zf.file.exists?("dir1/dir11/"))
     end
   end
-
 end
diff --git a/test/filesystem/file_nonmutating_test.rb b/test/filesystem/file_nonmutating_test.rb
index dd75910..52ce88a 100644
--- a/test/filesystem/file_nonmutating_test.rb
+++ b/test/filesystem/file_nonmutating_test.rb
@@ -502,5 +502,4 @@ class ZipFsFileNonmutatingTest < MiniTest::Test
       assert_equal(orig_file, zip_file)
     end
   end
-
 end
diff --git a/test/filesystem/file_stat_test.rb b/test/filesystem/file_stat_test.rb
index 3bfff20..52cf6dc 100644
--- a/test/filesystem/file_stat_test.rb
+++ b/test/filesystem/file_stat_test.rb
@@ -2,7 +2,6 @@ require 'test_helper'
 require 'zip/filesystem'
 
 class ZipFsFileStatTest < MiniTest::Test
-
   def setup
     @zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")
   end
@@ -62,5 +61,4 @@ class ZipFsFileStatTest < MiniTest::Test
   def test_blksize
     assert_nil(@zip_file.file.stat("file1").blksize)
   end
-
 end
diff --git a/test/gentestfiles.rb b/test/gentestfiles.rb
index aad8d0f..e85c6d9 100755
--- a/test/gentestfiles.rb
+++ b/test/gentestfiles.rb
@@ -52,7 +52,6 @@ class TestFiles
       end
       Dir.mkdir(name)
     end
-
   end
 end
 
diff --git a/test/input_stream_test.rb b/test/input_stream_test.rb
index 7901414..8bc9dbb 100644
--- a/test/input_stream_test.rb
+++ b/test/input_stream_test.rb
@@ -166,5 +166,4 @@ class ZipInputStreamTest < MiniTest::Test
       assert_equal("$VERBOSE =", zis.read(10))
     end
   end
-
 end
diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
index e802ee5..f29bad7 100644
--- a/test/local_entry_test.rb
+++ b/test/local_entry_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class ZipLocalEntryTest < MiniTest::Test
-
   CEH_FILE = 'test/data/generated/centralEntryHeader.bin'
   LEH_FILE = 'test/data/generated/localEntryHeader.bin'
 
diff --git a/test/unicode_file_names_and_comments_test.rb b/test/unicode_file_names_and_comments_test.rb
index a215064..9fea352 100644
--- a/test/unicode_file_names_and_comments_test.rb
+++ b/test/unicode_file_names_and_comments_test.rb
@@ -3,7 +3,6 @@
 require 'test_helper'
 
 class ZipUnicodeFileNamesAndComments < MiniTest::Test
-
   FILENAME = File.join(File.dirname(__FILE__), "test1.zip")
 
   def test_unicode_file_name
@@ -48,5 +47,4 @@ class ZipUnicodeFileNamesAndComments < MiniTest::Test
     end
     ::File.unlink(FILENAME)
   end
-
 end
diff --git a/test/zip64_full_test.rb b/test/zip64_full_test.rb
index 953fc68..5149090 100644
--- a/test/zip64_full_test.rb
+++ b/test/zip64_full_test.rb
@@ -46,7 +46,6 @@ if ENV['FULL_ZIP64_TEST']
       # but some OSes (*cough* OSX) still bundle a 5.xx release
       assert system("unzip -t #{test_filename}"), "third-party zip validation failed"
     end
-
   end
 
 end
diff --git a/test/zip64_support_test.rb b/test/zip64_support_test.rb
index ae93b40..3e4154a 100644
--- a/test/zip64_support_test.rb
+++ b/test/zip64_support_test.rb
@@ -11,5 +11,4 @@ class Zip64SupportTest < MiniTest::Test
     assert(test_rb.size == 482)
     assert(test_rb.compressed_size == 229)
   end
-
 end