diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 724d58a2f30..a9ee8c98795 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -30,12 +30,6 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyleAlignWith, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
diff --git a/lib/puppet/agent/locker.rb b/lib/puppet/agent/locker.rb
index b0ac4162412..6a4c1618593 100644
--- a/lib/puppet/agent/locker.rb
+++ b/lib/puppet/agent/locker.rb
@@ -42,5 +42,4 @@ def lockfile
     @lockfile
   end
   private :lockfile
-
 end
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
index 00c8a2dddd3..b8293e8b032 100644
--- a/lib/puppet/application.rb
+++ b/lib/puppet/application.rb
@@ -6,7 +6,6 @@
 require_relative '../puppet/application_support'
 
 module Puppet
-
 # Defines an abstract Puppet application.
 #
 # # Usage
diff --git a/lib/puppet/application_support.rb b/lib/puppet/application_support.rb
index 2a254c67fa8..1f38e29f0db 100644
--- a/lib/puppet/application_support.rb
+++ b/lib/puppet/application_support.rb
@@ -8,7 +8,6 @@
 
 module Puppet
   module ApplicationSupport
-
     # Pushes a Puppet Context configured with a remote environment for an agent
     # (one that exists at the master end), and a regular environment for other
     # modes. The configuration is overridden with options from the command line
diff --git a/lib/puppet/concurrent/lock.rb b/lib/puppet/concurrent/lock.rb
index 623cbe9ce1b..dafec737758 100644
--- a/lib/puppet/concurrent/lock.rb
+++ b/lib/puppet/concurrent/lock.rb
@@ -3,7 +3,6 @@
 
 module Puppet
 module Concurrent
-
 # A simple lock that at the moment only does any locking on jruby
 class Lock
   include Puppet::Concurrent::Synchronized
@@ -11,7 +10,6 @@ def synchronize
     yield
   end
 end
-
 end
 end
 
diff --git a/lib/puppet/concurrent/synchronized.rb b/lib/puppet/concurrent/synchronized.rb
index f74d3785d2b..57f71f6250a 100644
--- a/lib/puppet/concurrent/synchronized.rb
+++ b/lib/puppet/concurrent/synchronized.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet
 module Concurrent
-
 # Including Puppet::Concurrent::Synchronized into a class when running on JRuby
 # causes all of its instance methods to be synchronized on the instance itself.
 # When running on MRI it has no effect.
@@ -11,6 +10,5 @@ module Concurrent
 else
   module Synchronized; end
 end
-
 end
 end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 10340ab921c..8062967d062 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -2,7 +2,6 @@
 require_relative '../puppet/util/platform'
 
 module Puppet
-
   def self.default_diffargs
     '-u'
   end
diff --git a/lib/puppet/environments.rb b/lib/puppet/environments.rb
index e44b6a6fc32..bd171f36294 100644
--- a/lib/puppet/environments.rb
+++ b/lib/puppet/environments.rb
@@ -3,7 +3,6 @@
 
 # @api private
 module Puppet::Environments
-
   class EnvironmentNotFound < Puppet::Error
     def initialize(environment_name, original = nil)
       environmentpath = Puppet[:environmentpath]
diff --git a/lib/puppet/external/dot.rb b/lib/puppet/external/dot.rb
index 4554ee1068b..42c5956f3e0 100644
--- a/lib/puppet/external/dot.rb
+++ b/lib/puppet/external/dot.rb
@@ -8,7 +8,6 @@
 # It also supports undirected edges.
 
 module DOT
-
   # These global vars are used to make nice graph source.
 
   $tab  = '    '
diff --git a/lib/puppet/ffi/posix/functions.rb b/lib/puppet/ffi/posix/functions.rb
index b5f8a8a5b2a..b4eef0f8fa6 100644
--- a/lib/puppet/ffi/posix/functions.rb
+++ b/lib/puppet/ffi/posix/functions.rb
@@ -3,7 +3,6 @@
 
 module Puppet::FFI::POSIX
   module Functions
-
     extend FFI::Library
 
     ffi_convention :stdcall
diff --git a/lib/puppet/ffi/windows/functions.rb b/lib/puppet/ffi/windows/functions.rb
index f69869a4f25..89d3e04e835 100644
--- a/lib/puppet/ffi/windows/functions.rb
+++ b/lib/puppet/ffi/windows/functions.rb
@@ -3,7 +3,6 @@
 
 module Puppet::FFI::Windows
   module Functions
-
     extend FFI::Library
     include Puppet::FFI::Windows::Constants
 
diff --git a/lib/puppet/ffi/windows/structs.rb b/lib/puppet/ffi/windows/structs.rb
index 52ca771fb88..7254eb3cebf 100644
--- a/lib/puppet/ffi/windows/structs.rb
+++ b/lib/puppet/ffi/windows/structs.rb
@@ -4,7 +4,6 @@
 
 module Puppet::FFI::Windows
   module Structs
-
     extend FFI::Library
     extend Puppet::FFI::Windows::APITypes
 
diff --git a/lib/puppet/forge/errors.rb b/lib/puppet/forge/errors.rb
index cb9d277f8ea..69551a201cf 100644
--- a/lib/puppet/forge/errors.rb
+++ b/lib/puppet/forge/errors.rb
@@ -5,7 +5,6 @@
 
 # Puppet::Forge specific exceptions
 module Puppet::Forge::Errors
-
   # This exception is the parent for all Forge API errors
   class ForgeError < Puppet::Error
     # This is normally set by the child class, but if it is not this will
@@ -110,5 +109,4 @@ def multiline
       message.join("\n")
     end
   end
-
 end
diff --git a/lib/puppet/gettext/module_translations.rb b/lib/puppet/gettext/module_translations.rb
index 1a10ccc1404..334f48199b5 100644
--- a/lib/puppet/gettext/module_translations.rb
+++ b/lib/puppet/gettext/module_translations.rb
@@ -2,7 +2,6 @@
 require_relative '../../puppet/gettext/config'
 
 module Puppet::ModuleTranslations
-
   # @api private
   # Loads translation files for each of the specified modules,
   # if present. Requires the modules to have `forge_name` specified.
diff --git a/lib/puppet/interface/documentation.rb b/lib/puppet/interface/documentation.rb
index c50ffa9b0a6..9826c88cc57 100644
--- a/lib/puppet/interface/documentation.rb
+++ b/lib/puppet/interface/documentation.rb
@@ -110,7 +110,6 @@ def build_synopsis(face, action = nil, arguments = nil)
         end
       end
     end
-
   end
 
   # This module can be mixed in to provide a full set of documentation
diff --git a/lib/puppet/interface/option_manager.rb b/lib/puppet/interface/option_manager.rb
index be957967b0a..f5658cd117b 100644
--- a/lib/puppet/interface/option_manager.rb
+++ b/lib/puppet/interface/option_manager.rb
@@ -5,7 +5,6 @@
 # {Puppet::Interface.define define} block).
 # @api public
 module Puppet::Interface::OptionManager
-
   # @api private
   def display_global_options(*args)
     @display_global_options ||= []
diff --git a/lib/puppet/loaders.rb b/lib/puppet/loaders.rb
index 7527f97feaf..ef8b4e41be3 100644
--- a/lib/puppet/loaders.rb
+++ b/lib/puppet/loaders.rb
@@ -27,5 +27,4 @@ module Loader
       require_relative '../puppet/pops/loader/puppet_plan_instantiator'
     end
   end
-
 end
diff --git a/lib/puppet/module_tool/checksums.rb b/lib/puppet/module_tool/checksums.rb
index e741020ecc5..143c1b8dacd 100644
--- a/lib/puppet/module_tool/checksums.rb
+++ b/lib/puppet/module_tool/checksums.rb
@@ -3,7 +3,6 @@
 require_relative '../../puppet/network/format_support'
 
 module Puppet::ModuleTool
-
   # = Checksums
   #
   # This class provides methods for generating checksums for data and adding
diff --git a/lib/puppet/module_tool/contents_description.rb b/lib/puppet/module_tool/contents_description.rb
index cc8ba379292..e0ebd1e8aa6 100644
--- a/lib/puppet/module_tool/contents_description.rb
+++ b/lib/puppet/module_tool/contents_description.rb
@@ -2,7 +2,6 @@
 require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
-
   # = ContentsDescription
   #
   # This class populates +Metadata+'s Puppet type information.
diff --git a/lib/puppet/module_tool/dependency.rb b/lib/puppet/module_tool/dependency.rb
index e950bfa000d..7b70f9689a3 100644
--- a/lib/puppet/module_tool/dependency.rb
+++ b/lib/puppet/module_tool/dependency.rb
@@ -3,7 +3,6 @@
 require_relative '../../puppet/network/format_support'
 
 module Puppet::ModuleTool
-
   class Dependency
     include Puppet::Network::FormatSupport
 
diff --git a/lib/puppet/module_tool/errors/installer.rb b/lib/puppet/module_tool/errors/installer.rb
index 2214e19d755..bd9065045eb 100644
--- a/lib/puppet/module_tool/errors/installer.rb
+++ b/lib/puppet/module_tool/errors/installer.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::ModuleTool::Errors
-
   class InstallError < ModuleToolError; end
 
   class AlreadyInstalledError < InstallError
diff --git a/lib/puppet/module_tool/errors/shared.rb b/lib/puppet/module_tool/errors/shared.rb
index ebe0a3b9bc0..ad5b85dd376 100644
--- a/lib/puppet/module_tool/errors/shared.rb
+++ b/lib/puppet/module_tool/errors/shared.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::ModuleTool::Errors
-
   class NoVersionsSatisfyError < ModuleToolError
     def initialize(options)
       @requested_name    = options[:requested_name]
diff --git a/lib/puppet/module_tool/errors/uninstaller.rb b/lib/puppet/module_tool/errors/uninstaller.rb
index a2e7103398c..b98e10f8fb9 100644
--- a/lib/puppet/module_tool/errors/uninstaller.rb
+++ b/lib/puppet/module_tool/errors/uninstaller.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::ModuleTool::Errors
-
   class UninstallError < ModuleToolError; end
 
   class NoVersionMatchesError < UninstallError
diff --git a/lib/puppet/module_tool/errors/upgrader.rb b/lib/puppet/module_tool/errors/upgrader.rb
index 2fbb4058fca..8b2883f3177 100644
--- a/lib/puppet/module_tool/errors/upgrader.rb
+++ b/lib/puppet/module_tool/errors/upgrader.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::ModuleTool::Errors
-
   class UpgradeError < ModuleToolError
     def initialize(msg)
       @action = :upgrade
diff --git a/lib/puppet/module_tool/metadata.rb b/lib/puppet/module_tool/metadata.rb
index ef8737dda61..7aa56865dd5 100644
--- a/lib/puppet/module_tool/metadata.rb
+++ b/lib/puppet/module_tool/metadata.rb
@@ -6,7 +6,6 @@
 require 'set'
 
 module Puppet::ModuleTool
-
   # This class provides a data structure representing a module's metadata.
   # @api private
   class Metadata
diff --git a/lib/puppet/module_tool/shared_behaviors.rb b/lib/puppet/module_tool/shared_behaviors.rb
index bd5eebcffc8..d58c45f4662 100644
--- a/lib/puppet/module_tool/shared_behaviors.rb
+++ b/lib/puppet/module_tool/shared_behaviors.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::ModuleTool::Shared
-
   include Puppet::ModuleTool::Errors
 
   def get_local_constraints
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 663fab1f9af..c1b3abb4186 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -9,7 +9,6 @@ module Puppet::Network; end
 # @deprecated Use {Puppet::HTTP::Client} instead.
 #
 module Puppet::Network::HttpPool
-
   @http_client_class = Puppet::Network::HTTP::Connection
 
   def self.http_client_class
diff --git a/lib/puppet/pal/catalog_compiler.rb b/lib/puppet/pal/catalog_compiler.rb
index 432db7b802d..e3c757fd1b6 100644
--- a/lib/puppet/pal/catalog_compiler.rb
+++ b/lib/puppet/pal/catalog_compiler.rb
@@ -102,6 +102,5 @@ def evaluate_ast_node
       internal_compiler.evaluate_ast_node
     end
   end
-
 end
 end
diff --git a/lib/puppet/pal/compiler.rb b/lib/puppet/pal/compiler.rb
index 59c42dbc48e..ad44eeeced9 100644
--- a/lib/puppet/pal/compiler.rb
+++ b/lib/puppet/pal/compiler.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet
 module Pal
-
   # A configured compiler as obtained in the callback from `Puppet::Pal.with_script_compiler`.
   # (Later, there may also be a catalog compiler available.)
   #
@@ -218,6 +217,5 @@ def topscope
       internal_compiler.topscope
     end
   end
-
 end
 end
diff --git a/lib/puppet/pal/function_signature.rb b/lib/puppet/pal/function_signature.rb
index 8c49e14585f..fc64b06ea88 100644
--- a/lib/puppet/pal/function_signature.rb
+++ b/lib/puppet/pal/function_signature.rb
@@ -48,6 +48,5 @@ def callables
       signatures.is_a?(Puppet::Pops::Types::PVariantType) ? signatures.types : [signatures]
     end
   end
-
 end
 end
diff --git a/lib/puppet/pal/pal_impl.rb b/lib/puppet/pal/pal_impl.rb
index 5f008ab5abc..4bc11bbc536 100644
--- a/lib/puppet/pal/pal_impl.rb
+++ b/lib/puppet/pal/pal_impl.rb
@@ -28,7 +28,6 @@ module Puppet
 #
 # @api public
 module Pal
-
   # Defines a context in which multiple operations in an env with a script compiler can be performed in a given block.
   # The calls that takes place to PAL inside of the given block are all with the same instance of the compiler.
   # The parameter `configured_by_env` makes it possible to either use the configuration in the environment, or specify
diff --git a/lib/puppet/pal/plan_signature.rb b/lib/puppet/pal/plan_signature.rb
index 0f65a472b05..3618a7732f6 100644
--- a/lib/puppet/pal/plan_signature.rb
+++ b/lib/puppet/pal/plan_signature.rb
@@ -67,6 +67,5 @@ def params_type
       dispatcher.params_struct
     end
   end
-
 end
 end
diff --git a/lib/puppet/pal/script_compiler.rb b/lib/puppet/pal/script_compiler.rb
index d433714c613..3049a2a85e8 100644
--- a/lib/puppet/pal/script_compiler.rb
+++ b/lib/puppet/pal/script_compiler.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet
 module Pal
-
   class ScriptCompiler < Compiler
     # Returns the signature of the given plan name
     # @param plan_name [String] the name of the plan to get the signature of
@@ -69,6 +68,5 @@ def list_tasks(filter_regex = nil, error_collector = nil)
       list_loadable_kind(:task, filter_regex, error_collector)
     end
   end
-
 end
 end
diff --git a/lib/puppet/pal/task_signature.rb b/lib/puppet/pal/task_signature.rb
index 889cddf24f3..9aa3a9f6cce 100644
--- a/lib/puppet/pal/task_signature.rb
+++ b/lib/puppet/pal/task_signature.rb
@@ -59,6 +59,5 @@ def task
       @task
     end
   end
-
 end
 end
diff --git a/lib/puppet/parser/abstract_compiler.rb b/lib/puppet/parser/abstract_compiler.rb
index 98474e74e6e..b7fe6c12cd8 100644
--- a/lib/puppet/parser/abstract_compiler.rb
+++ b/lib/puppet/parser/abstract_compiler.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Puppet::Parser::AbstractCompiler
-
   # Returns the catalog for a compilation. Must return a Puppet::Resource::Catalog or fail with an 
   # error if the specific compiler does not support catalog operations.
   #
@@ -33,5 +32,4 @@ def qualified_variables
   def topscope
     raise Puppet::DevError("Class '#{self.class}' should have implemented 'topscope'")
   end
-
 end
diff --git a/lib/puppet/parser/files.rb b/lib/puppet/parser/files.rb
index e7773d3f8a4..935e7072c94 100644
--- a/lib/puppet/parser/files.rb
+++ b/lib/puppet/parser/files.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::Parser::Files
-
   module_function
 
   # Return a list of manifests as absolute filenames matching the given
diff --git a/lib/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
index 01165a65273..eaedf35f80a 100644
--- a/lib/puppet/parser/functions/split.rb
+++ b/lib/puppet/parser/functions/split.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::Parser::Functions
-
   newfunction(
   :split, :type => :rvalue,
   :arity => 2,
diff --git a/lib/puppet/plugins/syntax_checkers.rb b/lib/puppet/plugins/syntax_checkers.rb
index 603418b9fde..de8b89853b0 100644
--- a/lib/puppet/plugins/syntax_checkers.rb
+++ b/lib/puppet/plugins/syntax_checkers.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Plugins
 module SyntaxCheckers
-
   # The lookup **key** for the multibind containing syntax checkers used to syntax check embedded string in non
   # puppet DSL syntax.
   # @api public
diff --git a/lib/puppet/pops/adapters.rb b/lib/puppet/pops/adapters.rb
index 412b441e004..b7d25110b86 100644
--- a/lib/puppet/pops/adapters.rb
+++ b/lib/puppet/pops/adapters.rb
@@ -3,7 +3,6 @@
 #
 module Puppet::Pops
 module Adapters
-
   class ObjectIdCacheAdapter < Puppet::Pops::Adaptable::Adapter
     attr_accessor :cache
 
diff --git a/lib/puppet/pops/evaluator/deferred_resolver.rb b/lib/puppet/pops/evaluator/deferred_resolver.rb
index 7e32c66a215..e35e176a5b2 100644
--- a/lib/puppet/pops/evaluator/deferred_resolver.rb
+++ b/lib/puppet/pops/evaluator/deferred_resolver.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Evaluator
-
 class DeferredValue
   def initialize(proc)
     @proc = proc
diff --git a/lib/puppet/pops/evaluator/external_syntax_support.rb b/lib/puppet/pops/evaluator/external_syntax_support.rb
index 36b702b9dc3..21668b5af3f 100644
--- a/lib/puppet/pops/evaluator/external_syntax_support.rb
+++ b/lib/puppet/pops/evaluator/external_syntax_support.rb
@@ -43,5 +43,4 @@ def lookup_keys_for_syntax(syntax)
     end
     result
   end
-
 end
diff --git a/lib/puppet/pops/evaluator/runtime3_converter.rb b/lib/puppet/pops/evaluator/runtime3_converter.rb
index 67c20bcc796..bf163bb2ec2 100644
--- a/lib/puppet/pops/evaluator/runtime3_converter.rb
+++ b/lib/puppet/pops/evaluator/runtime3_converter.rb
@@ -217,5 +217,4 @@ def self.convert_return(val3x)
 
   @instance = self.new
 end
-
 end
diff --git a/lib/puppet/pops/evaluator/runtime3_resource_support.rb b/lib/puppet/pops/evaluator/runtime3_resource_support.rb
index 9fbdc190cc8..b83d4a23633 100644
--- a/lib/puppet/pops/evaluator/runtime3_resource_support.rb
+++ b/lib/puppet/pops/evaluator/runtime3_resource_support.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Evaluator
-
 # @api private
 module Runtime3ResourceSupport
   CLASS_STRING = 'class'
@@ -113,7 +112,6 @@ def self.find_defined_resource_type(scope, type_name)
     krt.find_definition(type_name)
   end
   private_class_method :find_defined_resource_type
-
 end
 end
 end
diff --git a/lib/puppet/pops/evaluator/runtime3_support.rb b/lib/puppet/pops/evaluator/runtime3_support.rb
index cc92cb247eb..c0b9ef5bb0d 100644
--- a/lib/puppet/pops/evaluator/runtime3_support.rb
+++ b/lib/puppet/pops/evaluator/runtime3_support.rb
@@ -7,7 +7,6 @@ module Evaluator
 #
 # @api private
 module Runtime3Support
-
   NAME_SPACE_SEPARATOR = '::'
 
   # Fails the evaluation of _semantic_ with a given issue.
diff --git a/lib/puppet/pops/loader/gem_support.rb b/lib/puppet/pops/loader/gem_support.rb
index 4e3106ade39..777be507eb3 100644
--- a/lib/puppet/pops/loader/gem_support.rb
+++ b/lib/puppet/pops/loader/gem_support.rb
@@ -9,7 +9,6 @@
 # and then trying to access those.
 #
 module Puppet::Pops::Loader::GemSupport
-
   # Produces the root directory of a gem given as an URI (gem://gemname/optional/path), or just the
   # gemname as a string.
   #
diff --git a/lib/puppet/pops/loader/loader.rb b/lib/puppet/pops/loader/loader.rb
index 08ab051eadb..694df6ffa1b 100644
--- a/lib/puppet/pops/loader/loader.rb
+++ b/lib/puppet/pops/loader/loader.rb
@@ -22,7 +22,6 @@
 #
 module Puppet::Pops
 module Loader
-
 ENVIRONMENT = 'environment'
 ENVIRONMENT_PRIVATE = 'environment private'
 
diff --git a/lib/puppet/pops/loader/loader_paths.rb b/lib/puppet/pops/loader/loader_paths.rb
index a5872850a27..91148e73d97 100644
--- a/lib/puppet/pops/loader/loader_paths.rb
+++ b/lib/puppet/pops/loader/loader_paths.rb
@@ -10,7 +10,6 @@
 module Puppet::Pops
 module Loader
 module LoaderPaths
-
   # Returns an array of SmartPath, each instantiated with a reference to the given loader (for root path resolution
   # and existence checks). The smart paths in the array appear in precedence order. The returned array may be
   # mutated.
diff --git a/lib/puppet/pops/loader/module_loaders.rb b/lib/puppet/pops/loader/module_loaders.rb
index fe93d7ff2a4..8bd233a0dfe 100644
--- a/lib/puppet/pops/loader/module_loaders.rb
+++ b/lib/puppet/pops/loader/module_loaders.rb
@@ -20,7 +20,6 @@ module Loader
 # @api private
 #
 module ModuleLoaders
-
   # Wildcard module name for module loaders, makes loading possible from any namespace.
   NAMESPACE_WILDCARD = '*'
 
diff --git a/lib/puppet/pops/loader/predefined_loader.rb b/lib/puppet/pops/loader/predefined_loader.rb
index e9d4f9e3e89..23f3cfe3889 100644
--- a/lib/puppet/pops/loader/predefined_loader.rb
+++ b/lib/puppet/pops/loader/predefined_loader.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::Pops::Loader
-
 # A PredefinedLoader is a loader that is manually populated with loaded elements
 # before being used. It never loads anything on its own.
 #
@@ -25,5 +24,4 @@ def synchronize(&block)
     yield
   end
 end
-
 end
diff --git a/lib/puppet/pops/loader/runtime3_type_loader.rb b/lib/puppet/pops/loader/runtime3_type_loader.rb
index 580f40d4d7f..5a4af917d4c 100644
--- a/lib/puppet/pops/loader/runtime3_type_loader.rb
+++ b/lib/puppet/pops/loader/runtime3_type_loader.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Loader
-
 # Runtime3TypeLoader
 # ===
 # Loads a resource type using the 3.x type loader
diff --git a/lib/puppet/pops/lookup/explainer.rb b/lib/puppet/pops/lookup/explainer.rb
index 0fa11390332..a38f5afe01c 100644
--- a/lib/puppet/pops/lookup/explainer.rb
+++ b/lib/puppet/pops/lookup/explainer.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Lookup
-
   # The ExplainNode contains information of a specific node in a tree traversed during
   # lookup. The tree can be traversed using the `parent` and `branches` attributes of
   # each node.
diff --git a/lib/puppet/pops/lookup/hiera_config.rb b/lib/puppet/pops/lookup/hiera_config.rb
index f8356be94ef..2f99bf50fcc 100644
--- a/lib/puppet/pops/lookup/hiera_config.rb
+++ b/lib/puppet/pops/lookup/hiera_config.rb
@@ -6,7 +6,6 @@
 
 module Puppet::Pops
 module Lookup
-
 # @api private
 class ScopeLookupCollectingInvocation < Invocation
   def initialize(scope)
diff --git a/lib/puppet/pops/model/ast.rb b/lib/puppet/pops/model/ast.rb
index 64f9be79747..0017a113ad7 100644
--- a/lib/puppet/pops/model/ast.rb
+++ b/lib/puppet/pops/model/ast.rb
@@ -4562,7 +4562,6 @@ def eql?(o)
   end
   alias == eql?
 end
-
 end
 
 module Model
@@ -4671,6 +4670,5 @@ def self.register_pcore_types
   Loaders.register_static_implementations(all_types)
 end
 end
-
 end
 end
diff --git a/lib/puppet/pops/model/pn_transformer.rb b/lib/puppet/pops/model/pn_transformer.rb
index 416de658d7d..66b470619c2 100644
--- a/lib/puppet/pops/model/pn_transformer.rb
+++ b/lib/puppet/pops/model/pn_transformer.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Model
-
 class PNTransformer
   extend Puppet::Concurrent::ThreadLocalSingleton
 
@@ -380,6 +379,5 @@ def if_to_pn(e, name)
     PN::Map.new(entries).as_call(name)
   end
 end
-
 end
 end
diff --git a/lib/puppet/pops/parser/epp_support.rb b/lib/puppet/pops/parser/epp_support.rb
index 55e502a05e3..6c087d13414 100644
--- a/lib/puppet/pops/parser/epp_support.rb
+++ b/lib/puppet/pops/parser/epp_support.rb
@@ -6,7 +6,6 @@ module Parser
 #
 require 'strscan'
 module EppSupport
-
   TOKEN_RENDER_STRING = [:RENDER_STRING, nil, 0]
   TOKEN_RENDER_EXPR   = [:RENDER_EXPR, nil, 0]
 
@@ -260,7 +259,6 @@ def scan(skip_leading=false)
       end
     end
   end
-
 end
 end
 end
diff --git a/lib/puppet/pops/parser/evaluating_parser.rb b/lib/puppet/pops/parser/evaluating_parser.rb
index 47e3436a933..d8c94b0cd5e 100644
--- a/lib/puppet/pops/parser/evaluating_parser.rb
+++ b/lib/puppet/pops/parser/evaluating_parser.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Parser
-
 # Does not support "import" and parsing ruby files
 #
 class EvaluatingParser
diff --git a/lib/puppet/pops/parser/heredoc_support.rb b/lib/puppet/pops/parser/heredoc_support.rb
index 6aff4ccd2da..4d71b4532e0 100644
--- a/lib/puppet/pops/parser/heredoc_support.rb
+++ b/lib/puppet/pops/parser/heredoc_support.rb
@@ -146,7 +146,6 @@ def heredoc_text(lines, leading, has_margin, remove_break)
     result.gsub!(/\r?\n\z/m, '') if remove_break
     [result, margin_per_line]
   end
-
 end
 end
 end
diff --git a/lib/puppet/pops/parser/interpolation_support.rb b/lib/puppet/pops/parser/interpolation_support.rb
index 0d821e413e6..94b3c3556e6 100644
--- a/lib/puppet/pops/parser/interpolation_support.rb
+++ b/lib/puppet/pops/parser/interpolation_support.rb
@@ -6,7 +6,6 @@
 # of passing parameters and evaluating conditional logic has a negative impact on performance.
 #
 module Puppet::Pops::Parser::InterpolationSupport
-
   PATTERN_VARIABLE       = %r{(::)?(\w+::)*\w+}
 
   # This is the starting point for a double quoted string with possible interpolation
@@ -246,5 +245,4 @@ def interpolate_uq_to(lexer)
       lexer.enqueue(queue.shift)
     end
   end
-
 end
diff --git a/lib/puppet/pops/parser/lexer_support.rb b/lib/puppet/pops/parser/lexer_support.rb
index 23dc3447442..39f7da58fdb 100644
--- a/lib/puppet/pops/parser/lexer_support.rb
+++ b/lib/puppet/pops/parser/lexer_support.rb
@@ -2,14 +2,12 @@
 
 module Puppet::Pops
 module Parser
-
 require_relative '../../../puppet/util/multi_match'
 
 # This is an integral part of the Lexer. It is broken out into a separate module
 # for maintainability of the code, and making the various parts of the lexer focused.
 #
 module LexerSupport
-
   # Returns "<eof>" if at end of input, else the following 5 characters with \n \r \t escaped
   def followed_by
     return "<eof>" if @scanner.eos?
@@ -215,7 +213,6 @@ def get_bom(content)
       (content.getbyte(3) || ' ')
     )
   end
-
 end
 end
 end
diff --git a/lib/puppet/pops/parser/pn_parser.rb b/lib/puppet/pops/parser/pn_parser.rb
index 9922ee6be20..390151a4110 100644
--- a/lib/puppet/pops/parser/pn_parser.rb
+++ b/lib/puppet/pops/parser/pn_parser.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Parser
-
 class PNParser
   LIT_TRUE = 'true'
   LIT_FALSE = 'false'
diff --git a/lib/puppet/pops/patterns.rb b/lib/puppet/pops/patterns.rb
index eb2110fbc7e..b71857e836c 100644
--- a/lib/puppet/pops/patterns.rb
+++ b/lib/puppet/pops/patterns.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # The Patterns module contains common regular expression patters for the Puppet DSL language
 module Puppet::Pops::Patterns
-
   # NUMERIC matches hex, octal, decimal, and floating point and captures several parts
   # 0 = entire matched number, leading and trailing whitespace and sign included
   # 1 = sign, +, - or nothing
@@ -57,5 +56,4 @@ module Puppet::Pops::Patterns
 
   # A Numeric var name must be the decimal number 0, or a decimal number not starting with 0
   NUMERIC_VAR_NAME = %r{\A(?:0|(?:[1-9][0-9]*))\z}
-
 end
diff --git a/lib/puppet/pops/resource/resource_type_impl.rb b/lib/puppet/pops/resource/resource_type_impl.rb
index ebef5815f9e..bf90297f47f 100644
--- a/lib/puppet/pops/resource/resource_type_impl.rb
+++ b/lib/puppet/pops/resource/resource_type_impl.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Resource
-
 def self.register_ptypes(loader, ir)
   types = [Param, ResourceTypeImpl].map do |c|
     c.register_ptype(loader, ir)
diff --git a/lib/puppet/pops/serialization/abstract_writer.rb b/lib/puppet/pops/serialization/abstract_writer.rb
index 844dceec3d4..765ee16053c 100644
--- a/lib/puppet/pops/serialization/abstract_writer.rb
+++ b/lib/puppet/pops/serialization/abstract_writer.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Serialization
-
 MAX_INTEGER =  0x7fffffffffffffff
 MIN_INTEGER = -0x8000000000000000
 
diff --git a/lib/puppet/pops/serialization/json.rb b/lib/puppet/pops/serialization/json.rb
index 42f3a9c650e..aa5f130c450 100644
--- a/lib/puppet/pops/serialization/json.rb
+++ b/lib/puppet/pops/serialization/json.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Serialization
-
 require_relative 'time_factory'
 require_relative 'abstract_reader'
 require_relative 'abstract_writer'
diff --git a/lib/puppet/pops/serialization/object.rb b/lib/puppet/pops/serialization/object.rb
index 42bd458b544..5931791e0d9 100644
--- a/lib/puppet/pops/serialization/object.rb
+++ b/lib/puppet/pops/serialization/object.rb
@@ -4,7 +4,6 @@
 
 module Puppet::Pops
 module Serialization
-
 # Instance reader for objects that implement {Types::PuppetObject}
 # @api private
 class ObjectReader
diff --git a/lib/puppet/pops/serialization/to_stringified_converter.rb b/lib/puppet/pops/serialization/to_stringified_converter.rb
index 241c4c46068..fb00270b247 100644
--- a/lib/puppet/pops/serialization/to_stringified_converter.rb
+++ b/lib/puppet/pops/serialization/to_stringified_converter.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Serialization
-
   # Class that can process an arbitrary object into a value that is assignable to `Data`
   # and where contents is converted from rich data to one of:
   # * Numeric (Integer, Float)
diff --git a/lib/puppet/pops/types/annotatable.rb b/lib/puppet/pops/types/annotatable.rb
index 3c5a45ad618..7530b662ddf 100644
--- a/lib/puppet/pops/types/annotatable.rb
+++ b/lib/puppet/pops/types/annotatable.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 KEY_ANNOTATIONS = 'annotations'
 
 # Behaviour common to all Pcore annotatable classes
diff --git a/lib/puppet/pops/types/iterable.rb b/lib/puppet/pops/types/iterable.rb
index 2d213c75c91..3dcbac22f6b 100644
--- a/lib/puppet/pops/types/iterable.rb
+++ b/lib/puppet/pops/types/iterable.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::Pops::Types
-
   # Implemented by classes that can produce an iterator to iterate over their contents
   module IteratorProducer
     def iterator
diff --git a/lib/puppet/pops/types/p_binary_type.rb b/lib/puppet/pops/types/p_binary_type.rb
index 45813e0732f..b11747830d7 100644
--- a/lib/puppet/pops/types/p_binary_type.rb
+++ b/lib/puppet/pops/types/p_binary_type.rb
@@ -2,7 +2,6 @@
 require 'base64'
 module Puppet::Pops
 module Types
-
 # A Puppet Language Type that represents binary data content (a sequence of 8-bit bytes).
 # Instances of this data type can be created from `String` and `Array[Integer[0,255]]`
 # values. Also see the `binary_file` function for reading binary content from a file.
diff --git a/lib/puppet/pops/types/p_init_type.rb b/lib/puppet/pops/types/p_init_type.rb
index 1cab1fcee75..454318477a4 100644
--- a/lib/puppet/pops/types/p_init_type.rb
+++ b/lib/puppet/pops/types/p_init_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # @api public
 class PInitType < PTypeWithContainedType
   def self.register_ptype(loader, ir)
diff --git a/lib/puppet/pops/types/p_meta_type.rb b/lib/puppet/pops/types/p_meta_type.rb
index f0a617933ff..2420df4430f 100644
--- a/lib/puppet/pops/types/p_meta_type.rb
+++ b/lib/puppet/pops/types/p_meta_type.rb
@@ -3,7 +3,6 @@
 # @api private
 module Puppet::Pops
 module Types
-
 KEY_NAME = 'name'
 KEY_TYPE = 'type'
 KEY_VALUE = 'value'
diff --git a/lib/puppet/pops/types/p_object_type.rb b/lib/puppet/pops/types/p_object_type.rb
index 514dbe0e5b2..dfd4b5969ef 100644
--- a/lib/puppet/pops/types/p_object_type.rb
+++ b/lib/puppet/pops/types/p_object_type.rb
@@ -4,7 +4,6 @@
 
 module Puppet::Pops
 module Types
-
 KEY_ATTRIBUTES = 'attributes'
 KEY_CHECKS = 'checks'
 KEY_CONSTANTS = 'constants'
diff --git a/lib/puppet/pops/types/p_object_type_extension.rb b/lib/puppet/pops/types/p_object_type_extension.rb
index bd9cc6e0b75..7584796bc41 100644
--- a/lib/puppet/pops/types/p_object_type_extension.rb
+++ b/lib/puppet/pops/types/p_object_type_extension.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # Base class for Parameterized Object implementations. The wrapper impersonates the base
 # object and extends it with methods to filter assignable types and instances based on parameter
 # values.
diff --git a/lib/puppet/pops/types/p_runtime_type.rb b/lib/puppet/pops/types/p_runtime_type.rb
index 48b7b6f4014..da31c266a3e 100644
--- a/lib/puppet/pops/types/p_runtime_type.rb
+++ b/lib/puppet/pops/types/p_runtime_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # @api public
 class PRuntimeType < PAnyType
   TYPE_NAME_OR_PATTERN = PVariantType.new([PStringType::NON_EMPTY, PTupleType.new([PRegexpType::DEFAULT, PStringType::NON_EMPTY])])
diff --git a/lib/puppet/pops/types/p_sem_ver_range_type.rb b/lib/puppet/pops/types/p_sem_ver_range_type.rb
index 8b486799640..1c596d7de1a 100644
--- a/lib/puppet/pops/types/p_sem_ver_range_type.rb
+++ b/lib/puppet/pops/types/p_sem_ver_range_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # An unparameterized type that represents all VersionRange instances
 #
 # @api public
diff --git a/lib/puppet/pops/types/p_sem_ver_type.rb b/lib/puppet/pops/types/p_sem_ver_type.rb
index 1465c6c63b3..86375605597 100644
--- a/lib/puppet/pops/types/p_sem_ver_type.rb
+++ b/lib/puppet/pops/types/p_sem_ver_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # A Puppet Language Type that exposes the {{SemanticPuppet::Version}} and {{SemanticPuppet::VersionRange}}.
 # The version type is parameterized with version ranges.
 #
diff --git a/lib/puppet/pops/types/p_sensitive_type.rb b/lib/puppet/pops/types/p_sensitive_type.rb
index a95125365a9..0af1b969685 100644
--- a/lib/puppet/pops/types/p_sensitive_type.rb
+++ b/lib/puppet/pops/types/p_sensitive_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # A Puppet Language type that wraps sensitive information. The sensitive type is parameterized by
 # the wrapped value type.
 #
@@ -77,6 +76,5 @@ def _assignable?(o, guard)
 
   DEFAULT = PSensitiveType.new
 end
-
 end
 end
diff --git a/lib/puppet/pops/types/p_type_set_type.rb b/lib/puppet/pops/types/p_type_set_type.rb
index a8429afe31b..94c09490e3f 100644
--- a/lib/puppet/pops/types/p_type_set_type.rb
+++ b/lib/puppet/pops/types/p_type_set_type.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 KEY_NAME_AUTHORITY = 'name_authority'
 KEY_TYPES = 'types'
 KEY_ALIAS = 'alias'
diff --git a/lib/puppet/pops/types/puppet_object.rb b/lib/puppet/pops/types/puppet_object.rb
index 833822f28e3..bcc88593b60 100644
--- a/lib/puppet/pops/types/puppet_object.rb
+++ b/lib/puppet/pops/types/puppet_object.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # Marker module for implementations that are mapped to Object types
 # @api public
 module PuppetObject
diff --git a/lib/puppet/pops/types/ruby_generator.rb b/lib/puppet/pops/types/ruby_generator.rb
index 424ce241aa2..281bc42362d 100644
--- a/lib/puppet/pops/types/ruby_generator.rb
+++ b/lib/puppet/pops/types/ruby_generator.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # @api private
 class RubyGenerator < TypeFormatter
   RUBY_RESERVED_WORDS = {
diff --git a/lib/puppet/pops/types/string_converter.rb b/lib/puppet/pops/types/string_converter.rb
index 76517dcc3f7..80ef094fe7e 100644
--- a/lib/puppet/pops/types/string_converter.rb
+++ b/lib/puppet/pops/types/string_converter.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Types
-
 # Converts Puppet runtime objects to String under the control of a Format.
 # Use from Puppet Language is via the function `new`.
 #
diff --git a/lib/puppet/pops/types/tree_iterators.rb b/lib/puppet/pops/types/tree_iterators.rb
index 2488c573c90..ac317715d8e 100644
--- a/lib/puppet/pops/types/tree_iterators.rb
+++ b/lib/puppet/pops/types/tree_iterators.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops::Types
 module Iterable
-
 class TreeIterator
   include Iterable
 
diff --git a/lib/puppet/pops/types/type_factory.rb b/lib/puppet/pops/types/type_factory.rb
index 0ac8e3bdc02..358677ddfcb 100644
--- a/lib/puppet/pops/types/type_factory.rb
+++ b/lib/puppet/pops/types/type_factory.rb
@@ -626,7 +626,6 @@ def self.type_reference(type_string = nil)
   def self.is_range_parameter?(t)
     t.is_a?(Integer) || t == 'default' || :default == t
   end
-
 end
 end
 end
diff --git a/lib/puppet/pops/types/type_with_members.rb b/lib/puppet/pops/types/type_with_members.rb
index 1efa690d361..043a39306ac 100644
--- a/lib/puppet/pops/types/type_with_members.rb
+++ b/lib/puppet/pops/types/type_with_members.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Types
-
 # Interface implemented by a type that has InvocableMembers
 module TypeWithMembers
   # @return [InvocableMember,nil] An invocable member if it exists, or `nil`
diff --git a/lib/puppet/pops/types/types.rb b/lib/puppet/pops/types/types.rb
index 8411883779e..2121f45fc51 100644
--- a/lib/puppet/pops/types/types.rb
+++ b/lib/puppet/pops/types/types.rb
@@ -15,7 +15,6 @@
 
 module Puppet::Pops
 module Types
-
 # The EMPTY_xxx declarations is for backward compatibility. They should not be explicitly referenced
 
 # @api private
diff --git a/lib/puppet/pops/validation.rb b/lib/puppet/pops/validation.rb
index 584eddaf1e4..3716db4b560 100644
--- a/lib/puppet/pops/validation.rb
+++ b/lib/puppet/pops/validation.rb
@@ -9,7 +9,6 @@ module Puppet::Pops
 # * **DiagnosticFormatter** - produces human readable output for a Diagnostic
 #
 module Validation
-
   # This class is an abstract base implementation of a _model validation factory_ that creates a validator instance
   # and associates it with a fully configured DiagnosticProducer.
   #
diff --git a/lib/puppet/pops/validation/checker4_0.rb b/lib/puppet/pops/validation/checker4_0.rb
index 925daa02368..8c26d5733d4 100644
--- a/lib/puppet/pops/validation/checker4_0.rb
+++ b/lib/puppet/pops/validation/checker4_0.rb
@@ -3,7 +3,6 @@
 
 module Puppet::Pops
 module Validation
-
 # A Validator validates a model.
 #
 # Validation is performed on each model element in isolation. Each method should validate the model element's state
diff --git a/lib/puppet/pops/validation/tasks_checker.rb b/lib/puppet/pops/validation/tasks_checker.rb
index ce3461f3ae2..e6892647e9b 100644
--- a/lib/puppet/pops/validation/tasks_checker.rb
+++ b/lib/puppet/pops/validation/tasks_checker.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Puppet::Pops
 module Validation
-
 # Validator that limits the set of allowed expressions to not include catalog related operations
 # @api private
 class TasksChecker < Checker4_0
diff --git a/lib/puppet/ssl/oids.rb b/lib/puppet/ssl/oids.rb
index d2587e595dd..5cba2facd59 100644
--- a/lib/puppet/ssl/oids.rb
+++ b/lib/puppet/ssl/oids.rb
@@ -28,7 +28,6 @@
 #
 # @api private
 module Puppet::SSL::Oids
-
   # Note: When updating the following OIDs make sure to also update the OID
   # definitions here:
   # https://github.com/puppetlabs/puppetserver/blob/master/src/clj/puppetlabs/puppetserver/certificate_authority.clj#L122-L159
diff --git a/lib/puppet/type/file/data_sync.rb b/lib/puppet/type/file/data_sync.rb
index 3e4b8f6762d..ba03ec57494 100644
--- a/lib/puppet/type/file/data_sync.rb
+++ b/lib/puppet/type/file/data_sync.rb
@@ -94,6 +94,5 @@ def contents_sync(param)
       resource.write(param)
       return_event
     end
-
   end
 end
diff --git a/lib/puppet/type/file/selcontext.rb b/lib/puppet/type/file/selcontext.rb
index e3b961be86e..c2bedce5835 100644
--- a/lib/puppet/type/file/selcontext.rb
+++ b/lib/puppet/type/file/selcontext.rb
@@ -137,6 +137,5 @@ def sync
     @event = :file_changed
     defaultto { self.retrieve_default_context(:selrange) }
   end
-
 end
 
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index c1a6c646808..cfdf967a7bb 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -6,7 +6,6 @@
 # which is why they have a search path for initscripts and such
 
 module Puppet
-
   Type.newtype(:service) do
     @doc = "Manage running services.  Service support unfortunately varies
       widely by platform --- some platforms have very little if any concept of a
diff --git a/lib/puppet/util/backups.rb b/lib/puppet/util/backups.rb
index e9d9f33a269..43c1979156e 100644
--- a/lib/puppet/util/backups.rb
+++ b/lib/puppet/util/backups.rb
@@ -2,7 +2,6 @@
 require 'find'
 require 'fileutils'
 module Puppet::Util::Backups
-
   # Deal with backups.
   def perform_backup(file = nil)
     # if they specifically don't want a backup, then just say
diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb
index 90d04c6b881..f9833eeb4cc 100644
--- a/lib/puppet/util/checksums.rb
+++ b/lib/puppet/util/checksums.rb
@@ -373,5 +373,4 @@ def checksum_stream(digest, block, lite = false)
     block.call(DigestLite.new(digest, lite))
     digest.hexdigest
   end
-
 end
diff --git a/lib/puppet/util/command_line/trollop.rb b/lib/puppet/util/command_line/trollop.rb
index da01c822883..22bf448035c 100644
--- a/lib/puppet/util/command_line/trollop.rb
+++ b/lib/puppet/util/command_line/trollop.rb
@@ -17,7 +17,6 @@ module Puppet
 module Util
 class CommandLine
 module Trollop
-
 VERSION = "1.16.2"
 
 ## Thrown by Parser in the event of a commandline error. Not needed if
@@ -818,7 +817,6 @@ def die arg, msg=nil
 end
 
 module_function :options, :die, :with_standard_exception_handling
-
 end # module
 end
 end
diff --git a/lib/puppet/util/execution.rb b/lib/puppet/util/execution.rb
index 78b160136ba..6f97a94b3dc 100644
--- a/lib/puppet/util/execution.rb
+++ b/lib/puppet/util/execution.rb
@@ -16,7 +16,6 @@ class ExecutionFailure < Puppet::Error
 # in classes that needs to execute system commands.
 # @api public
 module Puppet::Util::Execution
-
   # This is the full output from a process. The object itself (a String) is the
   # stdout of the process.
   #
diff --git a/lib/puppet/util/libuser.rb b/lib/puppet/util/libuser.rb
index cddcbe0e7ed..42c884615e1 100644
--- a/lib/puppet/util/libuser.rb
+++ b/lib/puppet/util/libuser.rb
@@ -9,5 +9,4 @@ def self.getenv
      newenv['LIBUSER_CONF'] = getconf
      newenv
    end
-
 end
diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb
index 2e006c904ef..d09849efc8d 100644
--- a/lib/puppet/util/logging.rb
+++ b/lib/puppet/util/logging.rb
@@ -5,7 +5,6 @@
 
 module Puppet::Util
 module Logging
-
   def send_log(level, message)
     Puppet::Util::Log.create({:level => level, :source => log_source, :message => message}.merge(log_metadata))
   end
diff --git a/lib/puppet/util/plist.rb b/lib/puppet/util/plist.rb
index 064b92bffec..a3580084b61 100644
--- a/lib/puppet/util/plist.rb
+++ b/lib/puppet/util/plist.rb
@@ -3,7 +3,6 @@
 require_relative '../../puppet/util/execution'
 
 module Puppet::Util::Plist
-
   class FormatError < RuntimeError; end
 
   # So I don't have to prepend every method name with 'self.' Most of the
diff --git a/lib/puppet/util/posix.rb b/lib/puppet/util/posix.rb
index a9e216096ae..e7f76fdb874 100644
--- a/lib/puppet/util/posix.rb
+++ b/lib/puppet/util/posix.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # Utility methods for interacting with POSIX objects; mostly user and group
 module Puppet::Util::POSIX
-
   # This is a list of environment variables that we will set when we want to override the POSIX locale
   LOCALE_ENV_VARS = ['LANG', 'LC_ALL', 'LC_MESSAGES', 'LANGUAGE',
                      'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME']
diff --git a/lib/puppet/util/rdoc/code_objects.rb b/lib/puppet/util/rdoc/code_objects.rb
index 72e91f13af6..c5ce73540e7 100644
--- a/lib/puppet/util/rdoc/code_objects.rb
+++ b/lib/puppet/util/rdoc/code_objects.rb
@@ -2,7 +2,6 @@
 require 'rdoc/code_objects'
 
 module RDoc
-
   # This modules contains various class that are used to hold information
   # about the various Puppet language structures we found while parsing.
   #
diff --git a/lib/puppet/util/rdoc/generators/puppet_generator.rb b/lib/puppet/util/rdoc/generators/puppet_generator.rb
index 53b62263ae6..f8a3e16e176 100644
--- a/lib/puppet/util/rdoc/generators/puppet_generator.rb
+++ b/lib/puppet/util/rdoc/generators/puppet_generator.rb
@@ -4,7 +4,6 @@
 require 'digest/md5'
 
 module Generators
-
   # This module holds all the classes needed to generate the HTML documentation
   # of a bunch of puppet manifests.
   #
@@ -895,5 +894,4 @@ def gen_method_index
       gen_an_index(HtmlMethod.all_methods, 'Defines')
     end
   end
-
 end
diff --git a/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb b/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
index 2e2e61bc856..92b9c8233b9 100644
--- a/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
+++ b/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
@@ -22,7 +22,6 @@
 
 module RDoc
   module Page
-
     FONTS = "Verdana,Arial,Helvetica,sans-serif"
 
 STYLE = %{
@@ -1062,7 +1061,6 @@ module Page
 </frameset>
 </html>
 }
-
   end # module Page
 end # class RDoc
 
diff --git a/lib/puppet/util/rdoc/parser/puppet_parser_core.rb b/lib/puppet/util/rdoc/parser/puppet_parser_core.rb
index 382df6fc141..df953c3b717 100644
--- a/lib/puppet/util/rdoc/parser/puppet_parser_core.rb
+++ b/lib/puppet/util/rdoc/parser/puppet_parser_core.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # Functionality common to both our RDoc version 1 and 2 parsers.
 module RDoc::PuppetParserCore
-
   SITE = "__site__"
 
   def self.included(base)
diff --git a/lib/puppet/util/rpm_compare.rb b/lib/puppet/util/rpm_compare.rb
index e23ee1cd098..24eb7686420 100644
--- a/lib/puppet/util/rpm_compare.rb
+++ b/lib/puppet/util/rpm_compare.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module Puppet::Util::RpmCompare
-
   ARCH_LIST = %w(
     noarch i386 i686 ppc ppc64 armv3l armv4b armv4l armv4tl armv5tel
     armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
diff --git a/lib/puppet/util/rubygems.rb b/lib/puppet/util/rubygems.rb
index a89f5743970..8269d39fec1 100644
--- a/lib/puppet/util/rubygems.rb
+++ b/lib/puppet/util/rubygems.rb
@@ -2,7 +2,6 @@
 require_relative '../../puppet/util'
 
 module Puppet::Util::RubyGems
-
   # Base/factory class for rubygems source. These classes introspec into
   # rubygems to in order to list where the rubygems system will look for files
   # to load.
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index abd15263d31..1817d5161d5 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -13,7 +13,6 @@
 require 'pathname'
 
 module Puppet::Util::SELinux
-
   S_IFREG = 0100000
   S_IFDIR = 0040000
   S_IFLNK = 0120000
diff --git a/lib/puppet/util/windows/daemon.rb b/lib/puppet/util/windows/daemon.rb
index 957fc1c3dd1..3572d6242d8 100644
--- a/lib/puppet/util/windows/daemon.rb
+++ b/lib/puppet/util/windows/daemon.rb
@@ -2,7 +2,6 @@
 require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
-
   # The Daemon class, based on the chef/win32-service implementation
   class Daemon
     include Puppet::FFI::Windows::Constants
diff --git a/lib/puppet/util/windows/process.rb b/lib/puppet/util/windows/process.rb
index 09ffc7144d9..f9566523fac 100644
--- a/lib/puppet/util/windows/process.rb
+++ b/lib/puppet/util/windows/process.rb
@@ -361,5 +361,4 @@ def supports_elevated_security?
     windows_major_version >= 6
   end
   module_function :supports_elevated_security?
-
 end