diff --git a/examples/site.pp b/examples/site.pp
index 86deef7c..87dd549c 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -43,7 +43,5 @@ node default {
   }
 
   # Install notification agent
-  class { 'ceilometer::agent::notification':
-  }
-
+  class { 'ceilometer::agent::notification': }
 }
diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 1e7489e6..fb8e29b5 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -122,7 +122,6 @@ class ceilometer::agent::notification (
   Array[String[1]] $pipeline_publishers       = ['gnocchi://'],
   $pipeline_cfg_file                          = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
   include ceilometer::params
 
diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 55219b0c..6a1f6230 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -159,7 +159,6 @@ class ceilometer::agent::polling (
   # DEPRECATED PARAMETERS
   $tenant_name_discovery           = undef,
 ) inherits ceilometer {
-
   include ceilometer::deps
   include ceilometer::params
 
@@ -249,7 +248,6 @@ Use the identity_name_discovery parameter instead.")
         tag    => ['openstack', 'ceilometer-package'],
       }
     }
-
   } else {
     package { 'ceilometer-polling':
       ensure => $package_ensure,
diff --git a/manifests/agent/polling/rgw.pp b/manifests/agent/polling/rgw.pp
index bdb3ab33..e804e18b 100644
--- a/manifests/agent/polling/rgw.pp
+++ b/manifests/agent/polling/rgw.pp
@@ -21,7 +21,6 @@ class ceilometer::agent::polling::rgw (
   $secret_key       = $facts['os_service_default'],
   $implicit_tenants = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
 
   ceilometer_config {
diff --git a/manifests/agent/polling/service_types.pp b/manifests/agent/polling/service_types.pp
index 034a12f8..9e5db705 100644
--- a/manifests/agent/polling/service_types.pp
+++ b/manifests/agent/polling/service_types.pp
@@ -36,7 +36,6 @@ class ceilometer::agent::polling::service_types (
   $cinder  = $facts['os_service_default'],
   $radosgw = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
 
   ceilometer_config {
diff --git a/manifests/agent/service_credentials.pp b/manifests/agent/service_credentials.pp
index 43d35900..d47b3215 100644
--- a/manifests/agent/service_credentials.pp
+++ b/manifests/agent/service_credentials.pp
@@ -62,7 +62,6 @@ class ceilometer::agent::service_credentials (
   $project_domain_name = 'Default',
   $auth_type           = 'password',
 ) {
-
   include ceilometer::deps
 
   if is_service_default($system_scope) {
diff --git a/manifests/cache.pp b/manifests/cache.pp
index 73482617..919772b3 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -259,7 +259,6 @@ class ceilometer::cache (
   $dead_timeout                         = $facts['os_service_default'],
   Boolean $manage_backend_package       = true,
 ) {
-
   include ceilometer::deps
 
   oslo::cache { 'ceilometer_config':
diff --git a/manifests/config.pp b/manifests/config.pp
index 018ebe5b..48e61ae8 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -29,10 +29,8 @@ class ceilometer::config (
   Hash $ceilometer_config          = {},
   Hash $ceilometer_rootwrap_config = {},
 ) {
-
   include ceilometer::deps
 
   create_resources('ceilometer_config', $ceilometer_config)
   create_resources('ceilometer_rootwrap_config', $ceilometer_rootwrap_config)
-
 }
diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index 1a5a9026..d8717ded 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -9,12 +9,11 @@
 #   Defaults to $facts['os_service_default']
 #
 class ceilometer::coordination (
-  $backend_url    = $facts['os_service_default'],
+  $backend_url = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
 
-  oslo::coordination{ 'ceilometer_config':
+  oslo::coordination { 'ceilometer_config':
     backend_url => $backend_url,
   }
 
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index ce3c82f6..2e4e8bb7 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -17,12 +17,11 @@
 #   (Optional) Skip gnocchi resource-types upgrade.
 #   Defaults to false
 #
-class ceilometer::db::sync(
+class ceilometer::db::sync (
   $extra_params                        = undef,
   $db_sync_timeout                     = 300,
   Boolean $skip_gnocchi_resource_types = false,
 ) {
-
   include ceilometer::deps
   include ceilometer::params
 
@@ -48,5 +47,4 @@ class ceilometer::db::sync(
     notify      => Anchor['ceilometer::dbsync::end'],
     tag         => 'openstack-db',
   }
-
 }
diff --git a/manifests/deps.pp b/manifests/deps.pp
index 2c3626fd..986eb1a3 100644
--- a/manifests/deps.pp
+++ b/manifests/deps.pp
@@ -3,7 +3,6 @@
 #  Ceilometer anchors and dependency management
 #
 class ceilometer::deps {
-
   assert_private()
 
   # Setup anchors for install, config and service phases of the module.  These
diff --git a/manifests/init.pp b/manifests/init.pp
index d25d26cb..590e4025 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -194,7 +194,7 @@
 #   (Optional) Timeout seconds for HTTP requests.
 #   Defaults to undef
 #
-class ceilometer(
+class ceilometer (
   $telemetry_secret,
   $max_parallel_requests              = $facts['os_service_default'],
   $notification_transport_url         = $facts['os_service_default'],
@@ -235,7 +235,6 @@ class ceilometer(
   $rabbit_heartbeat_in_pthread        = undef,
   $http_timeout                       = undef,
 ) {
-
   include ceilometer::deps
   include ceilometer::params
 
@@ -253,7 +252,7 @@ class ceilometer(
     purge => $purge_config,
   }
 
-  oslo::messaging::rabbit {'ceilometer_config':
+  oslo::messaging::rabbit { 'ceilometer_config':
     rabbit_ha_queues                => $rabbit_ha_queues,
     heartbeat_timeout_threshold     => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate                  => $rabbit_heartbeat_rate,
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 8271a58a..6750a557 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -61,7 +61,6 @@ class ceilometer::keystone::auth (
   $system_scope        = 'all',
   $system_roles        = [],
 ) {
-
   include ceilometer::deps
 
   # NOTE(tkajinam): ceilometer does not have api service, so we can use
diff --git a/manifests/logging.pp b/manifests/logging.pp
index e68fc119..e229b1a5 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -97,7 +97,7 @@
 #   Defaults to $facts['os_service_default'].
 #   Example: 'Y-%m-%d %H:%M:%S'
 #
-class ceilometer::logging(
+class ceilometer::logging (
   $use_syslog                    = $facts['os_service_default'],
   $use_json                      = $facts['os_service_default'],
   $use_journal                   = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class ceilometer::logging(
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
 
   oslo::log { 'ceilometer_config':
diff --git a/manifests/params.pp b/manifests/params.pp
index 13a6e2a9..8e925333 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,6 @@
 # should be considered to be constant
 #
 class ceilometer::params {
-
   assert_private()
 
   include openstacklib::defaults
diff --git a/manifests/reports.pp b/manifests/reports.pp
index ddac63f6..574ab712 100644
--- a/manifests/reports.pp
+++ b/manifests/reports.pp
@@ -17,12 +17,11 @@
 #   is set.
 #   Defaults to $facts['os_service_default']
 #
-class ceilometer::reports(
+class ceilometer::reports (
   $log_dir                     = $facts['os_service_default'],
   $file_event_handler          = $facts['os_service_default'],
   $file_event_handler_interval = $facts['os_service_default'],
 ) {
-
   include ceilometer::deps
 
   oslo::reports { 'ceilometer_config':