diff --git a/examples/cinder_volume_with_pacemaker.pp b/examples/cinder_volume_with_pacemaker.pp
index 68481d93..92beaf28 100644
--- a/examples/cinder_volume_with_pacemaker.pp
+++ b/examples/cinder_volume_with_pacemaker.pp
@@ -36,4 +36,3 @@ class { 'cinder::scheduler':
   enabled        => false,
   manage_service => false,
 }
-
diff --git a/manifests/api.pp b/manifests/api.pp
index 524f5be4..6fd6001b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -130,7 +130,6 @@ class cinder::api (
   $osapi_volume_listen_port       = $facts['os_service_default'],
   $use_forwarded_for              = $facts['os_service_default'],
 ) inherits cinder::params {
-
   include cinder::deps
   include cinder::params
   include cinder::policy
@@ -176,7 +175,6 @@ class cinder::api (
       Cinder_api_paste_ini<||> ~> Service['cinder-api']
       # On any uwsgi config change, we must restart Cinder API.
       Cinder_api_uwsgi_config<||> ~> Service['cinder-api']
-
     } elsif $service_name == 'httpd' {
       service { 'cinder-api':
         ensure => 'stopped',
@@ -191,7 +189,6 @@ class cinder::api (
 
       # On any api-paste.ini config change, we must restart Cinder API.
       Cinder_api_paste_ini<||> ~> Service[$service_name]
-
     } else {
       fail("Invalid service_name. Either cinder-api/openstack-cinder-api for \
 running as a standalone service, or httpd for being run by a httpd server")
@@ -210,7 +207,7 @@ running as a standalone service, or httpd for being run by a httpd server")
     'DEFAULT/use_forwarded_for':        value => $use_forwarded_for;
   }
 
-  oslo::middleware {'cinder_config':
+  oslo::middleware { 'cinder_config':
     enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
     max_request_body_size        => $max_request_body_size,
   }
diff --git a/manifests/backend/defaults.pp b/manifests/backend/defaults.pp
index d418b2cd..b07b0aac 100644
--- a/manifests/backend/defaults.pp
+++ b/manifests/backend/defaults.pp
@@ -27,7 +27,6 @@ class cinder::backend::defaults (
   $image_volume_cache_max_size_gb = $facts['os_service_default'],
   $image_volume_cache_max_count   = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
diff --git a/manifests/backend/dellemc_powerflex.pp b/manifests/backend/dellemc_powerflex.pp
index 05826966..071883e8 100644
--- a/manifests/backend/dellemc_powerflex.pp
+++ b/manifests/backend/dellemc_powerflex.pp
@@ -117,7 +117,7 @@
 #    powerflex_storage_pools => 'domain1:pool1',
 #  }
 #
-define cinder::backend::dellemc_powerflex(
+define cinder::backend::dellemc_powerflex (
   $san_login,
   $san_password,
   $san_ip,
@@ -142,7 +142,6 @@ define cinder::backend::dellemc_powerflex(
   Boolean $manage_volume_type               = false,
   Hash $extra_options                       = {},
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -169,13 +168,13 @@ define cinder::backend::dellemc_powerflex(
     "${name}/driver_ssl_cert_verify":                   value => $driver_ssl_cert_verify;
     "${name}/driver_ssl_cert_path":                     value => $driver_ssl_cert_path;
   }
+
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/dellemc_powermax.pp b/manifests/backend/dellemc_powermax.pp
index 23e11b99..38f897f6 100644
--- a/manifests/backend/dellemc_powermax.pp
+++ b/manifests/backend/dellemc_powermax.pp
@@ -101,7 +101,6 @@ define cinder::backend::dellemc_powermax (
   Hash $extra_options                            = {},
   Boolean $manage_volume_type                    = false,
 ) {
-
   include cinder::deps
 
   $volume_driver = $powermax_storage_protocol ? {
@@ -137,10 +136,9 @@ define cinder::backend::dellemc_powermax (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/dellemc_powerstore.pp b/manifests/backend/dellemc_powerstore.pp
index 9f15d82a..49e7e789 100644
--- a/manifests/backend/dellemc_powerstore.pp
+++ b/manifests/backend/dellemc_powerstore.pp
@@ -74,7 +74,6 @@ define cinder::backend::dellemc_powerstore (
   Boolean $manage_volume_type           = false,
   Hash $extra_options                   = {},
 ) {
-
   include cinder::deps
 
   $driver = 'dell_emc.powerstore.driver.PowerStoreDriver'
@@ -101,10 +100,9 @@ define cinder::backend::dellemc_powerstore (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/dellemc_sc.pp b/manifests/backend/dellemc_sc.pp
index 1a22364b..f85c15e9 100644
--- a/manifests/backend/dellemc_sc.pp
+++ b/manifests/backend/dellemc_sc.pp
@@ -132,7 +132,6 @@ define cinder::backend::dellemc_sc (
   Enum['iSCSI', 'FC'] $sc_storage_protocol = 'iSCSI',
   Hash $extra_options                      = {},
 ) {
-
   include cinder::deps
 
   warning('Support for Dell SC Series storage driver options has been deprecated.')
@@ -170,10 +169,9 @@ define cinder::backend::dellemc_sc (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/dellemc_unity.pp b/manifests/backend/dellemc_unity.pp
index b9e2ac8f..7ba2ec00 100644
--- a/manifests/backend/dellemc_unity.pp
+++ b/manifests/backend/dellemc_unity.pp
@@ -85,7 +85,6 @@ define cinder::backend::dellemc_unity (
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   $driver = 'dell_emc.unity.Driver'
@@ -109,10 +108,9 @@ define cinder::backend::dellemc_unity (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/dellemc_xtremio.pp b/manifests/backend/dellemc_xtremio.pp
index 2ebb56a5..fe8d6888 100644
--- a/manifests/backend/dellemc_xtremio.pp
+++ b/manifests/backend/dellemc_xtremio.pp
@@ -104,7 +104,6 @@ define cinder::backend::dellemc_xtremio (
   $xtremio_ports                                = $facts['os_service_default'],
   Hash $extra_options                           = {},
 ) {
-
   include cinder::deps
 
   warning('Support for Dell XtremeIO storage driver options has been deprecated.')
@@ -136,10 +135,9 @@ define cinder::backend::dellemc_xtremio (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/emc_vnx.pp b/manifests/backend/emc_vnx.pp
index e8152968..873386d4 100644
--- a/manifests/backend/emc_vnx.pp
+++ b/manifests/backend/emc_vnx.pp
@@ -163,7 +163,6 @@ define cinder::backend::emc_vnx (
   $naviseccli_path                  = $facts['os_service_default'],
   Boolean $manage_volume_type       = false,
 ) {
-
   include cinder::deps
 
   warning('Support for Dell VNX storage driver options has been deprecated.')
@@ -200,10 +199,9 @@ define cinder::backend::emc_vnx (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/gpfs.pp b/manifests/backend/gpfs.pp
index a7ac0baa..0ff877b2 100644
--- a/manifests/backend/gpfs.pp
+++ b/manifests/backend/gpfs.pp
@@ -126,7 +126,6 @@ define cinder::backend::gpfs (
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   if ! ($gpfs_images_share_mode in ['copy', 'copy_on_write', $facts['os_service_default']]) {
@@ -159,10 +158,9 @@ define cinder::backend::gpfs (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/hpe3par_iscsi.pp b/manifests/backend/hpe3par_iscsi.pp
index 6eff5eb1..4593afdc 100644
--- a/manifests/backend/hpe3par_iscsi.pp
+++ b/manifests/backend/hpe3par_iscsi.pp
@@ -92,7 +92,7 @@
 #   Example :
 #     { 'h3par_iscsi_backend/param1' => { 'value' => value1 } }
 #
-define cinder::backend::hpe3par_iscsi(
+define cinder::backend::hpe3par_iscsi (
   $hpe3par_api_url,
   $hpe3par_username,
   $hpe3par_password,
@@ -115,7 +115,6 @@ define cinder::backend::hpe3par_iscsi(
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   if ($hpe3par_snapshot_expiration <= $hpe3par_snapshot_retention) {
@@ -147,10 +146,9 @@ define cinder::backend::hpe3par_iscsi(
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/ibm_svf.pp b/manifests/backend/ibm_svf.pp
index 754cecef..aaae7c9d 100644
--- a/manifests/backend/ibm_svf.pp
+++ b/manifests/backend/ibm_svf.pp
@@ -106,7 +106,6 @@ define cinder::backend::ibm_svf (
   Hash $extra_options                                   = {},
   Boolean $manage_volume_type                           = false,
 ) {
-
   include cinder::deps
 
   # NOTE: Svf was earlier called as storwize/svc driver, so the cinder
@@ -138,10 +137,9 @@ define cinder::backend::ibm_svf (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/iscsi.pp b/manifests/backend/iscsi.pp
index 0471751d..31312c3a 100644
--- a/manifests/backend/iscsi.pp
+++ b/manifests/backend/iscsi.pp
@@ -92,7 +92,6 @@ define cinder::backend::iscsi (
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -130,7 +129,7 @@ define cinder::backend::iscsi (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
@@ -178,5 +177,4 @@ define cinder::backend::iscsi (
       fail("Unsupported target helper: ${target_helper_real}.")
     }
   }
-
 }
diff --git a/manifests/backend/netapp.pp b/manifests/backend/netapp.pp
index b05b0b2d..1bd4c1c2 100644
--- a/manifests/backend/netapp.pp
+++ b/manifests/backend/netapp.pp
@@ -219,7 +219,6 @@ define cinder::backend::netapp (
   # DEPRECATED PARAMETERS
   $netapp_copyoffload_tool_path           = undef,
 ) {
-
   include cinder::deps
 
   if $netapp_copyoffload_tool_path != undef {
@@ -269,10 +268,9 @@ and will be removed in a future release.")
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/nexenta.pp b/manifests/backend/nexenta.pp
index eef4fd19..02b497c2 100644
--- a/manifests/backend/nexenta.pp
+++ b/manifests/backend/nexenta.pp
@@ -99,7 +99,6 @@ define cinder::backend::nexenta (
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -124,10 +123,9 @@ define cinder::backend::nexenta (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/nfs.pp b/manifests/backend/nfs.pp
index 76ea699a..57697298 100644
--- a/manifests/backend/nfs.pp
+++ b/manifests/backend/nfs.pp
@@ -131,7 +131,6 @@ define cinder::backend::nfs (
   Boolean $manage_volume_type             = false,
   Hash $extra_options                     = {},
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -166,7 +165,7 @@ define cinder::backend::nfs (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
@@ -177,5 +176,4 @@ define cinder::backend::nfs (
   Package<| title == 'nfs-client' |> { tag +> 'cinder-support-package' }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/nvmeof.pp b/manifests/backend/nvmeof.pp
index d057b3d3..c0eeaa73 100644
--- a/manifests/backend/nvmeof.pp
+++ b/manifests/backend/nvmeof.pp
@@ -105,7 +105,6 @@ define cinder::backend::nvmeof (
   $target_secondary_ip_addresses  = $facts['os_service_default'],
   $lvm_type                       = $facts['os_service_default'],
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/backend/pure.pp b/manifests/backend/pure.pp
index e2eaaec0..7e3d6d33 100644
--- a/manifests/backend/pure.pp
+++ b/manifests/backend/pure.pp
@@ -108,7 +108,7 @@
 #   Example :
 #     { 'pure_backend/param1' => { 'value' => value1 } }
 #
-define cinder::backend::pure(
+define cinder::backend::pure (
   $san_ip,
   $pure_api_token,
   $volume_backend_name                               = $name,
@@ -131,7 +131,6 @@ define cinder::backend::pure(
   Boolean $manage_volume_type                        = false,
   Hash $extra_options                                = {},
 ) {
-
   include cinder::deps
 
   $volume_driver = $pure_storage_protocol ? {
@@ -165,7 +164,7 @@ define cinder::backend::pure(
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
diff --git a/manifests/backend/quobyte.pp b/manifests/backend/quobyte.pp
index c8d662fa..db206f8d 100644
--- a/manifests/backend/quobyte.pp
+++ b/manifests/backend/quobyte.pp
@@ -77,7 +77,6 @@ define cinder::backend::quobyte (
   $image_volume_cache_max_count   = $facts['os_service_default'],
   Boolean $manage_volume_type     = false,
 ) {
-
   include cinder::deps
 
   warning("Support for Quobyte volume driver has been deprecated because \
@@ -100,8 +99,7 @@ the driver is now marked unsupported.")
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
-
 }
diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp
index f93bb96e..7dc6d9ec 100644
--- a/manifests/backend/rbd.pp
+++ b/manifests/backend/rbd.pp
@@ -144,7 +144,6 @@ define cinder::backend::rbd (
   Boolean $manage_package            = true,
   Hash $extra_options                = {},
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -179,7 +178,7 @@ define cinder::backend::rbd (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
diff --git a/manifests/backend/san.pp b/manifests/backend/san.pp
index 9fc603bb..de6aad79 100644
--- a/manifests/backend/san.pp
+++ b/manifests/backend/san.pp
@@ -114,7 +114,6 @@ define cinder::backend::san (
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   warning('The cinder::backend::san defined resource type is deprecated.')
@@ -143,10 +142,9 @@ define cinder::backend::san (
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/solidfire.pp b/manifests/backend/solidfire.pp
index 8744b5aa..983103e3 100644
--- a/manifests/backend/solidfire.pp
+++ b/manifests/backend/solidfire.pp
@@ -120,7 +120,7 @@
 #   Example :
 #     { 'solidfire_backend/param1' => { 'value' => value1 } }
 #
-define cinder::backend::solidfire(
+define cinder::backend::solidfire (
   $san_ip,
   $san_login,
   $san_password,
@@ -148,7 +148,6 @@ define cinder::backend::solidfire(
   Boolean $manage_volume_type     = false,
   Hash $extra_options             = {},
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -181,10 +180,9 @@ define cinder::backend::solidfire(
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'volume_backend_name' => $volume_backend_name},
+      properties => { 'volume_backend_name' => $volume_backend_name },
     }
   }
 
   create_resources('cinder_config', $extra_options)
-
 }
diff --git a/manifests/backend/vstorage.pp b/manifests/backend/vstorage.pp
index 6e7c0046..d1f5863e 100644
--- a/manifests/backend/vstorage.pp
+++ b/manifests/backend/vstorage.pp
@@ -79,7 +79,6 @@ define cinder::backend::vstorage (
   $mount_permissions                       = '0770',
   Boolean $manage_package                  = true,
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -102,11 +101,11 @@ is now marked unsupported.")
   if $manage_volume_type {
     cinder_type { $volume_backend_name:
       ensure     => present,
-      properties => {'vz:volume_format' => 'qcow2'},
+      properties => { 'vz:volume_format' => 'qcow2' },
     }
     cinder_type { "${volume_backend_name}-ploop":
       ensure     => present,
-      properties => {'vz:volume_format' => 'ploop'},
+      properties => { 'vz:volume_format' => 'ploop' },
     }
   }
 
@@ -128,5 +127,4 @@ is now marked unsupported.")
     require => Anchor['cinder::install::end'],
     notify  => Anchor['cinder::service::begin'],
   }
-
 }
diff --git a/manifests/backends.pp b/manifests/backends.pp
index d973b593..6df34829 100644
--- a/manifests/backends.pp
+++ b/manifests/backends.pp
@@ -19,7 +19,6 @@ class cinder::backends (
   Array[String[1], 1] $enabled_backends,
   $backend_host     = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   # Maybe this could be extended to dynamically find the enabled names
diff --git a/manifests/backup.pp b/manifests/backup.pp
index ddf1eff2..4775c18b 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -67,7 +67,6 @@ class cinder::backup (
   $backup_workers         = $facts['os_service_default'],
   $backup_max_operations  = $facts['os_service_default'],
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -102,5 +101,4 @@ class cinder::backup (
     'DEFAULT/backup_workers':        value => $backup_workers;
     'DEFAULT/backup_max_operations': value => $backup_max_operations;
   }
-
 }
diff --git a/manifests/backup/ceph.pp b/manifests/backup/ceph.pp
index e716c9f7..9cba1e8b 100644
--- a/manifests/backup/ceph.pp
+++ b/manifests/backup/ceph.pp
@@ -70,7 +70,6 @@ class cinder::backup::ceph (
   $backup_ceph_stripe_count  = $facts['os_service_default'],
   $backup_ceph_max_snapshots = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -83,5 +82,4 @@ class cinder::backup::ceph (
     'DEFAULT/backup_ceph_stripe_count':  value => $backup_ceph_stripe_count;
     'DEFAULT/backup_ceph_max_snapshots': value => $backup_ceph_max_snapshots;
   }
-
 }
diff --git a/manifests/backup/glusterfs.pp b/manifests/backup/glusterfs.pp
index 2c147fea..3b29cf1d 100644
--- a/manifests/backup/glusterfs.pp
+++ b/manifests/backup/glusterfs.pp
@@ -43,7 +43,6 @@ class cinder::backup::glusterfs (
   $glusterfs_backup_mount_point = $facts['os_service_default'],
   $glusterfs_backup_share       = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -51,5 +50,4 @@ class cinder::backup::glusterfs (
     'DEFAULT/glusterfs_backup_mount_point': value => $glusterfs_backup_mount_point;
     'DEFAULT/glusterfs_backup_share':       value => $glusterfs_backup_share;
   }
-
 }
diff --git a/manifests/backup/google.pp b/manifests/backup/google.pp
index 7b0bf507..1cd5aaa2 100644
--- a/manifests/backup/google.pp
+++ b/manifests/backup/google.pp
@@ -102,7 +102,6 @@ class cinder::backup::google (
   $backup_gcs_user_agent            = $facts['os_service_default'],
   $backup_gcs_enable_progress_timer = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -121,5 +120,4 @@ class cinder::backup::google (
     'DEFAULT/backup_gcs_user_agent':           value => $backup_gcs_user_agent;
     'DEFAULT/backup_gcs_enable_project_timer': value => $backup_gcs_enable_progress_timer;
   }
-
 }
diff --git a/manifests/backup/nfs.pp b/manifests/backup/nfs.pp
index a3fcd2fb..08972dc8 100644
--- a/manifests/backup/nfs.pp
+++ b/manifests/backup/nfs.pp
@@ -83,7 +83,6 @@ class cinder::backup::nfs (
   $backup_compression_algorithm = $facts['os_service_default'],
   $package_ensure               = 'present',
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/backup/posix.pp b/manifests/backup/posix.pp
index 8ec0b2f8..22e03ae6 100644
--- a/manifests/backup/posix.pp
+++ b/manifests/backup/posix.pp
@@ -63,7 +63,6 @@ class cinder::backup::posix (
   $backup_posix_path            = $facts['os_service_default'],
   $backup_container             = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -74,5 +73,4 @@ class cinder::backup::posix (
     'DEFAULT/backup_posix_path':            value => $backup_posix_path;
     'DEFAULT/backup_container':             value => $backup_container;
   }
-
 }
diff --git a/manifests/backup/s3.pp b/manifests/backup/s3.pp
index 7dafd52c..eb923de9 100644
--- a/manifests/backup/s3.pp
+++ b/manifests/backup/s3.pp
@@ -130,7 +130,6 @@ class cinder::backup::s3 (
   $backup_s3_sse_customer_key       = $facts['os_service_default'],
   $backup_s3_sse_customer_algorithm = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -155,5 +154,4 @@ class cinder::backup::s3 (
     'DEFAULT/backup_s3_sse_customer_key':       value => $backup_s3_sse_customer_key, secret => true;
     'DEFAULT/backup_s3_sse_customer_algorithm': value => $backup_s3_sse_customer_algorithm;
   }
-
 }
diff --git a/manifests/backup/swift.pp b/manifests/backup/swift.pp
index bc2bb9d5..5ccbf159 100644
--- a/manifests/backup/swift.pp
+++ b/manifests/backup/swift.pp
@@ -102,7 +102,6 @@ class cinder::backup::swift (
   $backup_compression_algorithm       = $facts['os_service_default'],
   $backup_swift_service_auth          = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -121,5 +120,4 @@ class cinder::backup::swift (
     'DEFAULT/backup_compression_algorithm':       value => $backup_compression_algorithm;
     'DEFAULT/backup_swift_service_auth':          value => $backup_swift_service_auth;
   }
-
 }
diff --git a/manifests/client.pp b/manifests/client.pp
index 5c8b90f6..8326a856 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -8,10 +8,9 @@
 #   (Optional) Ensure state for package.
 #   Defaults to 'present'.
 #
-class cinder::client(
+class cinder::client (
   $package_ensure = 'present'
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/config.pp b/manifests/config.pp
index d395ac89..edd69acf 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -36,7 +36,6 @@ class cinder::config (
   Hash $api_paste_ini_config   = {},
   Hash $cinder_rootwrap_config = {},
 ) {
-
   include cinder::deps
 
   create_resources('cinder_config', $cinder_config)
diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index 55640354..994fd2fe 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -11,10 +11,9 @@
 class cinder::coordination (
   $backend_url = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
-  oslo::coordination{ 'cinder_config':
+  oslo::coordination { 'cinder_config':
     backend_url => $backend_url,
   }
 
diff --git a/manifests/cors.pp b/manifests/cors.pp
index 66fd9ec2..7764dd74 100644
--- a/manifests/cors.pp
+++ b/manifests/cors.pp
@@ -44,7 +44,6 @@ class cinder::cors (
   $allow_methods     = $facts['os_service_default'],
   $allow_headers     = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::cors { 'cinder_config':
diff --git a/manifests/cron/db_purge.pp b/manifests/cron/db_purge.pp
index cbffa854..63f7a015 100644
--- a/manifests/cron/db_purge.pp
+++ b/manifests/cron/db_purge.pp
@@ -72,7 +72,6 @@ class cinder::cron::db_purge (
   Integer[0] $maxdelay              = 0,
   Enum['present', 'absent'] $ensure = 'present',
 ) inherits cinder::params {
-
   include cinder::deps
 
   if $maxdelay == 0 {
diff --git a/manifests/db.pp b/manifests/db.pp
index ab66bde2..6b06cda5 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -54,7 +54,6 @@ class cinder::db (
   $database_pool_timeout            = $facts['os_service_default'],
   $mysql_enable_ndb                 = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::db { 'cinder_config':
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index bcddaad0..14049551 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -41,7 +41,6 @@ class cinder::db::mysql (
   $charset       = 'utf8',
   $collate       = 'utf8_general_ci',
 ) {
-
   include cinder::deps
 
   openstacklib::db::mysql { 'cinder':
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index bd8ca1ff..d5736f90 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -24,14 +24,13 @@
 #    (Optional) Privileges given to the database user.
 #    Default to 'ALL'
 #
-class cinder::db::postgresql(
+class cinder::db::postgresql (
   $password,
   $dbname     = 'cinder',
   $user       = 'cinder',
   $encoding   = undef,
   $privileges = 'ALL',
 ) {
-
   include cinder::deps
 
   openstacklib::db::postgresql { 'cinder':
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index eca656ac..69b11ffa 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -13,11 +13,10 @@
 #   (Optional) Timeout for the execution of the db_sync
 #   Defaults to 300
 #
-class cinder::db::sync(
+class cinder::db::sync (
   $extra_params    = undef,
   $db_sync_timeout = 300,
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 0e9e8273..3b94e61f 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -78,7 +78,6 @@ class cinder::glance (
   $glance_catalog_info        = $facts['os_service_default'],
   $glance_core_properties     = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
@@ -92,5 +91,4 @@ class cinder::glance (
     'DEFAULT/glance_catalog_info':        value => $glance_catalog_info;
     'DEFAULT/glance_core_properties':     value => join(any2array($glance_core_properties), ',');
   }
-
 }
diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
index 87f50b7e..65bf9893 100644
--- a/manifests/healthcheck.pp
+++ b/manifests/healthcheck.pp
@@ -46,7 +46,6 @@ class cinder::healthcheck (
   $disable_by_file_paths   = $facts['os_service_default'],
   $enable_by_file_paths    = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::healthcheck { 'cinder_config':
diff --git a/manifests/init.pp b/manifests/init.pp
index 87f19113..ee273b7a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -310,7 +310,6 @@ class cinder (
   # DEPRECATED PARAMETERS
   $rabbit_heartbeat_in_pthread          = undef,
 ) inherits cinder::params {
-
   include cinder::deps
   include cinder::db
 
diff --git a/manifests/key_manager.pp b/manifests/key_manager.pp
index b65d8d18..66415e90 100644
--- a/manifests/key_manager.pp
+++ b/manifests/key_manager.pp
@@ -11,7 +11,6 @@
 class cinder::key_manager (
   $backend = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::key_manager { 'cinder_config':
diff --git a/manifests/key_manager/barbican.pp b/manifests/key_manager/barbican.pp
index 64fd2cd6..5fdecc84 100644
--- a/manifests/key_manager/barbican.pp
+++ b/manifests/key_manager/barbican.pp
@@ -47,7 +47,6 @@ class cinder::key_manager::barbican (
   $barbican_region_name    = $facts['os_service_default'],
   $send_service_user_token = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::key_manager::barbican { 'cinder_config':
diff --git a/manifests/key_manager/barbican/service_user.pp b/manifests/key_manager/barbican/service_user.pp
index 8dca5b33..067a1255 100644
--- a/manifests/key_manager/barbican/service_user.pp
+++ b/manifests/key_manager/barbican/service_user.pp
@@ -62,7 +62,7 @@
 #  (Optional) The region in which the identity server can be found.
 #  Defaults to $facts['os_service_default'].
 #
-class cinder::key_manager::barbican::service_user(
+class cinder::key_manager::barbican::service_user (
   $password,
   $username            = 'cinder',
   $auth_url            = 'http://localhost:5000',
@@ -78,7 +78,6 @@ class cinder::key_manager::barbican::service_user(
   $keyfile             = $facts['os_service_default'],
   $region_name         = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::key_manager::barbican::service_user { 'cinder_config':
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 6002da37..3f2c2a12 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -131,7 +131,6 @@ class cinder::keystone::auth (
   String[1] $service_description_v3          = 'Cinder Service v3',
   String[1] $region                          = 'RegionOne',
 ) {
-
   include cinder::deps
 
   Keystone::Resource::Service_identity['cinder'] -> Anchor['cinder::service::end']
@@ -171,5 +170,4 @@ class cinder::keystone::auth (
     admin_url           => $admin_url_v3,
     internal_url        => $internal_url_v3,
   }
-
 }
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 4096674c..892fd7ea 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -199,7 +199,7 @@
 #  (Optional) Hash of additional parameters to pass through to the keystone
 #  authtoken class. Values set here override the individual parameters above.
 #
-class cinder::keystone::authtoken(
+class cinder::keystone::authtoken (
   String[1] $password,
   $username                       = 'cinder',
   $auth_url                       = 'http://localhost:5000',
@@ -239,7 +239,6 @@ class cinder::keystone::authtoken(
   $interface                      = $facts['os_service_default'],
   $params                         = {},
 ) {
-
   include cinder::deps
 
   keystone::resource::authtoken {
diff --git a/manifests/keystone/service_user.pp b/manifests/keystone/service_user.pp
index 36208669..df4e002b 100644
--- a/manifests/keystone/service_user.pp
+++ b/manifests/keystone/service_user.pp
@@ -67,7 +67,7 @@
 #  (Optional) The region in which the identity server can be found.
 #  Defaults to $facts['os_service_default'].
 #
-class cinder::keystone::service_user(
+class cinder::keystone::service_user (
   $username                = 'cinder',
   $password                = $facts['os_service_default'],
   $auth_url                = 'http://localhost:5000',
@@ -84,7 +84,6 @@ class cinder::keystone::service_user(
   $keyfile                 = $facts['os_service_default'],
   $region_name             = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   keystone::resource::service_user { 'cinder_config':
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 44aa607b..d85912a5 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 cinder::logging(
+class cinder::logging (
   $use_syslog                    = $facts['os_service_default'],
   $use_json                      = $facts['os_service_default'],
   $use_journal                   = $facts['os_service_default'],
@@ -118,7 +118,6 @@ class cinder::logging(
   $instance_uuid_format          = $facts['os_service_default'],
   $log_date_format               = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::log { 'cinder_config':
diff --git a/manifests/nova.pp b/manifests/nova.pp
index 82a0f9f6..a88d26c1 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -97,7 +97,6 @@ class cinder::nova (
   $project_domain_name = 'Default',
   $system_scope        = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   if is_service_default($system_scope) {
diff --git a/manifests/os_brick.pp b/manifests/os_brick.pp
index 846a1216..eb2dc512 100644
--- a/manifests/os_brick.pp
+++ b/manifests/os_brick.pp
@@ -17,11 +17,12 @@
 #   (Optional) Interval value to wait for multipath device to be ready for I/O.
 #   Defaults to $facts['os_service_default']
 #
-class cinder::os_brick(
+class cinder::os_brick (
   $lock_path                  = $facts['os_service_default'],
   $wait_mpath_device_attempts = $facts['os_service_default'],
   $wait_mpath_device_interval = $facts['os_service_default'],
 ) {
+  include cinder::deps
 
   oslo::os_brick { 'cinder_config':
     lock_path                  => $lock_path,
diff --git a/manifests/policy.pp b/manifests/policy.pp
index f08ef33c..737c9bc7 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -54,7 +54,6 @@ class cinder::policy (
   $policy_dirs          = $facts['os_service_default'],
   Boolean $purge_config = false,
 ) {
-
   include cinder::deps
   include cinder::params
 
@@ -82,5 +81,4 @@ class cinder::policy (
     policy_default_rule  => $policy_default_rule,
     policy_dirs          => $policy_dirs,
   }
-
 }
diff --git a/manifests/quota.pp b/manifests/quota.pp
index 02a0ab68..b839dc3a 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -42,7 +42,6 @@ class cinder::quota (
   $quota_driver           = $facts['os_service_default'],
   $per_volume_size_limit  = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   cinder_config {
diff --git a/manifests/quota_set.pp b/manifests/quota_set.pp
index 30892b95..b7f456eb 100644
--- a/manifests/quota_set.pp
+++ b/manifests/quota_set.pp
@@ -57,7 +57,6 @@ define cinder::quota_set (
   $class_name      = 'default',
   $volume_type     = $name,
 ) {
-
   include cinder::deps
 
   if $os_region_name {
@@ -68,8 +67,7 @@ define cinder::quota_set (
       "OS_AUTH_URL=${os_auth_url}",
       "OS_REGION_NAME=${os_region_name}",
     ]
-  }
-  else {
+  } else {
     $cinder_env = [
       "OS_TENANT_NAME=${os_tenant_name}",
       "OS_USERNAME=${os_username}",
@@ -78,7 +76,7 @@ define cinder::quota_set (
     ]
   }
 
-  exec {"openstack quota set --class ${class_name}":
+  exec { "openstack quota set --class ${class_name}":
     # lint:ignore:140chars
     command     => "openstack quota set --class ${class_name} --volumes ${quota_volumes} --snapshots ${quota_snapshots} --gigabytes ${quota_gigabytes} --volume-type '${volume_type}'",
     # lint:endignore
diff --git a/manifests/reports.pp b/manifests/reports.pp
index c24e037c..0cd5b5ac 100644
--- a/manifests/reports.pp
+++ b/manifests/reports.pp
@@ -17,12 +17,11 @@
 #   is set.
 #   Defaults to $facts['os_service_default']
 #
-class cinder::reports(
+class cinder::reports (
   $log_dir                     = $facts['os_service_default'],
   $file_event_handler          = $facts['os_service_default'],
   $file_event_handler_interval = $facts['os_service_default'],
 ) {
-
   include cinder::deps
 
   oslo::reports { 'cinder_config':
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index d59b6c14..0c4561a6 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -50,7 +50,6 @@ class cinder::scheduler (
   # DEPRECATED PARAMETERS
   $scheduler_driver       = undef
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp
index e137dc94..e1cca2d6 100644
--- a/manifests/scheduler/filter.pp
+++ b/manifests/scheduler/filter.pp
@@ -44,7 +44,6 @@ class cinder::scheduler::filter (
   # DEPRECATED PARAMETERS
   $scheduler_default_filters            = undef,
 ) {
-
   include cinder::deps
 
   if $scheduler_default_filters != undef {
diff --git a/manifests/setup_test_volume.pp b/manifests/setup_test_volume.pp
index 2108501c..77a8cef2 100644
--- a/manifests/setup_test_volume.pp
+++ b/manifests/setup_test_volume.pp
@@ -20,13 +20,12 @@
 #   (Optional) Volume image location.
 #   Defaults to '/var/lib/cinder'.
 #
-class cinder::setup_test_volume(
+class cinder::setup_test_volume (
   String[1] $volume_name            = 'cinder-volumes',
   Stdlib::Absolutepath $volume_path = '/var/lib/cinder',
   $size                             = '4G',
   $loopback_device                  = '/dev/loop2'
 ) {
-
   include cinder::deps
 
   stdlib::ensure_packages ( 'lvm2', {
diff --git a/manifests/volume.pp b/manifests/volume.pp
index eb4f271e..8127394c 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -71,7 +71,6 @@ class cinder::volume (
   $init_host_max_objects_retrieval      = $facts['os_service_default'],
   $backend_stats_polling_interval       = $facts['os_service_default'],
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index b6c0011b..e2adf45c 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -162,7 +162,6 @@ class cinder::wsgi::apache (
   $request_headers             = undef,
   $vhost_custom_fragment       = undef,
 ) {
-
   include cinder::deps
   include cinder::params
 
diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp
index c2ac130b..6ab8a7cb 100644
--- a/manifests/wsgi/uwsgi.pp
+++ b/manifests/wsgi/uwsgi.pp
@@ -25,11 +25,10 @@ class cinder::wsgi::uwsgi (
   $processes         = $facts['os_workers'],
   $threads           = 32,
   $listen_queue_size = 100,
-){
-
+) {
   include cinder::deps
 
-  if $facts['os']['name'] != 'Debian'{
+  if $facts['os']['name'] != 'Debian' {
     warning('This class is only valid for Debian, as other operating systems are not using uwsgi by default.')
   }