diff --git a/manifests/cache.pp b/manifests/cache.pp
index 2c500dce..09a61d1e 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -23,7 +23,6 @@
 #   (optional) IP address on which memcached instance should listen
 #   Defaults to '127.0.0.1'
 #
-
 class cloud::cache (
   $listen_ip = '127.0.0.1',
 ){
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 4b6e842c..e67173ab 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -72,7 +72,6 @@
 #   (optionnal) Memcached servers used by Keystone. Should be an array.
 #   Defaults to ['127.0.0.1:11211']
 #
-
 class cloud::compute(
   $nova_db_host             = '127.0.0.1',
   $nova_db_use_slave        = false,
diff --git a/manifests/compute/api.pp b/manifests/compute/api.pp
index e0745734..f5a52952 100644
--- a/manifests/compute/api.pp
+++ b/manifests/compute/api.pp
@@ -15,7 +15,6 @@
 #
 # Compute API node
 #
-
 class cloud::compute::api(
   $ks_keystone_internal_host            = '127.0.0.1',
   $ks_keystone_internal_proto           = 'http',
diff --git a/manifests/compute/cert.pp b/manifests/compute/cert.pp
index 75c37f29..e9770fc7 100644
--- a/manifests/compute/cert.pp
+++ b/manifests/compute/cert.pp
@@ -15,7 +15,6 @@
 #
 # Compute Certificate node
 #
-
 class cloud::compute::cert {
 
   include 'cloud::compute'
diff --git a/manifests/compute/conductor.pp b/manifests/compute/conductor.pp
index 75267ea9..4ac4031d 100644
--- a/manifests/compute/conductor.pp
+++ b/manifests/compute/conductor.pp
@@ -15,7 +15,6 @@
 #
 # Compute Conductor node
 #
-
 class cloud::compute::conductor {
 
   include 'cloud::compute'
diff --git a/manifests/compute/consoleauth.pp b/manifests/compute/consoleauth.pp
index 96b32d9b..4e282598 100644
--- a/manifests/compute/consoleauth.pp
+++ b/manifests/compute/consoleauth.pp
@@ -15,7 +15,6 @@
 #
 # Compute Authenfication Console node
 #
-
 class cloud::compute::consoleauth {
 
   include 'cloud::compute'
diff --git a/manifests/compute/consoleproxy.pp b/manifests/compute/consoleproxy.pp
index cef616a1..83813b35 100644
--- a/manifests/compute/consoleproxy.pp
+++ b/manifests/compute/consoleproxy.pp
@@ -15,7 +15,6 @@
 #
 # Compute Proxy Console node
 #
-
 class cloud::compute::consoleproxy(
   $api_eth    = '127.0.0.1',
   $spice_port = '6082'
diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp
index 925a5d08..f532b2ec 100644
--- a/manifests/compute/controller.pp
+++ b/manifests/compute/controller.pp
@@ -15,7 +15,6 @@
 #
 # Compute controller node
 #
-
 class cloud::compute::controller(
   $ks_keystone_internal_host            = '127.0.0.1',
   $ks_nova_password                     = 'novapassword',
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index 4241fc9e..e5c9fad2 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -74,7 +74,7 @@
 #   (optional) Forward HTTPS proto in the headers
 #   Useful when activating SSL binding on HAproxy and not in Horizon.
 #   Defaults to false
-
+#
 class cloud::dashboard(
   $ks_keystone_internal_host = '127.0.0.1',
   $secret_key                = 'secrete',
diff --git a/manifests/database/dbaas.pp b/manifests/database/dbaas.pp
index 762fd1ca..51f83ec3 100644
--- a/manifests/database/dbaas.pp
+++ b/manifests/database/dbaas.pp
@@ -51,7 +51,6 @@
 #   (optional) Admin tenant name used to connect to nova.
 #   Defaults to 'admin'
 #
-
 class cloud::database::dbaas(
   $trove_db_host                = '127.0.0.1',
   $trove_db_user                = 'trove',
diff --git a/manifests/database/dbaas/api.pp b/manifests/database/dbaas/api.pp
index 72234c7a..47ffab13 100644
--- a/manifests/database/dbaas/api.pp
+++ b/manifests/database/dbaas/api.pp
@@ -17,7 +17,7 @@
 #
 # Class to install API service of OpenStack Database as a Service (Trove)
 #
-
+#
 class cloud::database::dbaas::api(
   $ks_trove_password          = 'trovepassword',
   $verbose                    = true,
diff --git a/manifests/database/dbaas/conductor.pp b/manifests/database/dbaas/conductor.pp
index 9ef0903c..90177b3c 100644
--- a/manifests/database/dbaas/conductor.pp
+++ b/manifests/database/dbaas/conductor.pp
@@ -17,7 +17,7 @@
 #
 # Class to install Conductor service of OpenStack Database as a Service (Trove)
 #
-
+#
 class cloud::database::dbaas::conductor(
   $ks_keystone_internal_host  = '127.0.0.1',
   $ks_keystone_internal_port  = '5000',
diff --git a/manifests/database/dbaas/taskmanager.pp b/manifests/database/dbaas/taskmanager.pp
index 4a7e6b03..3c3349c5 100644
--- a/manifests/database/dbaas/taskmanager.pp
+++ b/manifests/database/dbaas/taskmanager.pp
@@ -17,7 +17,7 @@
 #
 # Class to install Taskmanager service of OpenStack Database as a Service (Trove)
 #
-
+#
 class cloud::database::dbaas::taskmanager(
   $ks_keystone_internal_host  = '127.0.0.1',
   $ks_keystone_internal_port  = '5000',
diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp
index 4c5a4307..c5faa78e 100644
--- a/manifests/database/nosql.pp
+++ b/manifests/database/nosql.pp
@@ -35,7 +35,6 @@
 #   If set to false, the setup won't be HA and no replicaset will be created.
 #   Defaults to hostname
 #
-
 class cloud::database::nosql(
   $bind_ip         = '127.0.0.1',
   $nojournal       = false,
diff --git a/manifests/image.pp b/manifests/image.pp
index 76f20598..da12db91 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -68,7 +68,6 @@
 #   (optional) Syslog facility to receive log lines
 #   Defaults to 'LOG_LOCAL0'
 #
-
 class cloud::image(
   $glance_db_host                   = '127.0.0.1',
   $glance_db_user                   = 'glance',
diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp
index dc89de61..7364370c 100644
--- a/manifests/image/registry.pp
+++ b/manifests/image/registry.pp
@@ -55,7 +55,6 @@
 #   (optional) Syslog facility to receive log lines
 #   Defaults to 'LOG_LOCAL0'
 #
-
 class cloud::image::registry(
   $glance_db_host                   = '127.0.0.1',
   $glance_db_user                   = 'glance',
diff --git a/manifests/init.pp b/manifests/init.pp
index 83459ac4..00689b30 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,6 @@
 #
 # Installs the private cloud system requirements
 #
-
 class cloud(
   $rhn_registration = undef,
   $root_password    = 'root',
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 078a29f2..2af0c11e 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -17,7 +17,6 @@
 #
 # Configure common logging
 #
-
 class cloud::logging{
 
   include ::fluentd
diff --git a/manifests/logging/server.pp b/manifests/logging/server.pp
index 0e9fdf8d..76667875 100644
--- a/manifests/logging/server.pp
+++ b/manifests/logging/server.pp
@@ -15,7 +15,6 @@
 #
 # == Class: cloud::logging::server
 #
-
 class cloud::logging::server{
 
   include ::elasticsearch
diff --git a/manifests/monitoring/agent/sensu.pp b/manifests/monitoring/agent/sensu.pp
index 308c7096..743a0e86 100644
--- a/manifests/monitoring/agent/sensu.pp
+++ b/manifests/monitoring/agent/sensu.pp
@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-
 class cloud::monitoring::agent::sensu {
 
   Package['sensu'] -> Sensu::Plugin <<| |>>
diff --git a/manifests/network.pp b/manifests/network.pp
index a64fb031..b105fcdc 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -91,7 +91,6 @@
 #   Supported values: 'ml2', 'n1kv'.
 #   Defaults to 'ml2'
 #
-
 class cloud::network(
   $verbose                    = true,
   $debug                      = true,
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 23e8ed42..7f198c71 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -19,7 +19,6 @@
 #   (optionnal) Manage or not external network with provider network API
 #   Defaults to false.
 #
-
 class cloud::network::controller(
   $neutron_db_host         = '127.0.0.1',
   $neutron_db_user         = 'neutron',
diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp
index c02779e5..a693ab88 100644
--- a/manifests/network/dhcp.pp
+++ b/manifests/network/dhcp.pp
@@ -15,7 +15,6 @@
 #
 # Network DHCP node
 #
-
 class cloud::network::dhcp(
   $veth_mtu           = 1500,
   $debug              = true,
diff --git a/manifests/network/l3.pp b/manifests/network/l3.pp
index b1af47f6..6264da55 100644
--- a/manifests/network/l3.pp
+++ b/manifests/network/l3.pp
@@ -15,7 +15,6 @@
 #
 # Network L3 node
 #
-
 class cloud::network::l3(
   $external_int     = 'eth1',
   $ext_provider_net = false,
diff --git a/manifests/network/lbaas.pp b/manifests/network/lbaas.pp
index 23de8f03..0e8c2455 100644
--- a/manifests/network/lbaas.pp
+++ b/manifests/network/lbaas.pp
@@ -15,7 +15,6 @@
 #
 # Network LBaaS node
 #
-
 class cloud::network::lbaas(
   $debug              = true,
   $manage_haproxy_pkg = true
diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp
index 2d339301..34908795 100644
--- a/manifests/network/metadata.pp
+++ b/manifests/network/metadata.pp
@@ -16,7 +16,6 @@
 # Network Metadata node (need to be run once)
 # Could be managed by spof_node manifest
 #
-
 class cloud::network::metadata(
   $enabled                              = true,
   $debug                                = true,
diff --git a/manifests/network/vpn.pp b/manifests/network/vpn.pp
index 41c3bf15..f351f592 100644
--- a/manifests/network/vpn.pp
+++ b/manifests/network/vpn.pp
@@ -15,7 +15,6 @@
 #
 # Network VPNaaS node
 #
-
 class cloud::network::vpn{
 
   include 'cloud::network'
diff --git a/manifests/object.pp b/manifests/object.pp
index 9e0c5340..0ad00e70 100644
--- a/manifests/object.pp
+++ b/manifests/object.pp
@@ -22,7 +22,6 @@
 # [*swift_hash_suffix*]
 #   (required) String of text to be used as a salt when hashing to determine mappings in the ring.
 #
-
 class cloud::object(
   $swift_hash_suffix = undef
 ) {
diff --git a/manifests/object/controller.pp b/manifests/object/controller.pp
index fe7df7a1..50e56763 100644
--- a/manifests/object/controller.pp
+++ b/manifests/object/controller.pp
@@ -15,7 +15,6 @@
 #
 # Swift Proxy node
 #
-
 class cloud::object::controller(
   $ks_keystone_admin_host       = '127.0.0.1',
   $ks_keystone_admin_port       = 35357,
diff --git a/manifests/object/tweaking.pp b/manifests/object/tweaking.pp
index f1882356..9e3c2d7c 100644
--- a/manifests/object/tweaking.pp
+++ b/manifests/object/tweaking.pp
@@ -15,7 +15,6 @@
 #
 # Swift tweaking
 #
-
 class cloud::object::tweaking {
   file {'/etc/sysctl.d/swift-tuning.conf':
     content => "
diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp
index 9c7f63cc..40ef37cd 100644
--- a/manifests/orchestration.pp
+++ b/manifests/orchestration.pp
@@ -91,7 +91,6 @@
 #   (optional) Syslog facility to receive log lines
 #   Defaults to 'LOG_LOCAL0'
 #
-
 class cloud::orchestration(
   $ks_keystone_internal_host  = '127.0.0.1',
   $ks_keystone_internal_port  = '5000',
diff --git a/manifests/orchestration/api.pp b/manifests/orchestration/api.pp
index a1f0c988..73451db4 100644
--- a/manifests/orchestration/api.pp
+++ b/manifests/orchestration/api.pp
@@ -15,7 +15,6 @@
 #
 # Orchestration APIs node
 #
-
 class cloud::orchestration::api(
   $ks_heat_internal_port            = 8004,
   $ks_heat_cfn_internal_port        = 8000,
diff --git a/manifests/orchestration/engine.pp b/manifests/orchestration/engine.pp
index f92945f0..88713c72 100644
--- a/manifests/orchestration/engine.pp
+++ b/manifests/orchestration/engine.pp
@@ -16,7 +16,6 @@
 # Orchestration engine node (should be run once)
 # Could be managed by spof node as Active / Passive.
 #
-
 class cloud::orchestration::engine(
   $enabled                        = true,
   $ks_heat_public_host            = '127.0.0.1',
diff --git a/manifests/spof.pp b/manifests/spof.pp
index b5169bcf..97af00f9 100644
--- a/manifests/spof.pp
+++ b/manifests/spof.pp
@@ -30,7 +30,6 @@
 #   (optionnal) IP address used to send multicast traffic
 #   Defaults to '239.1.1.2'
 #
-
 class cloud::spof(
   $cluster_ip        = '127.0.0.1',
   $cluster_members   = false,
diff --git a/manifests/storage/rbd.pp b/manifests/storage/rbd.pp
index d1e25614..3c58310b 100644
--- a/manifests/storage/rbd.pp
+++ b/manifests/storage/rbd.pp
@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-
 class cloud::storage::rbd (
   $fsid            = undef,
   $cluster_network = '127.0.0.1/24',
diff --git a/manifests/storage/rbd/monitor.pp b/manifests/storage/rbd/monitor.pp
index e6a950be..9d24ea5f 100644
--- a/manifests/storage/rbd/monitor.pp
+++ b/manifests/storage/rbd/monitor.pp
@@ -13,7 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-
 class cloud::storage::rbd::monitor (
   $id             = $::uniqueid,
   $mon_addr       = '127.0.0.1',
diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp
index 84701542..32599f4d 100644
--- a/manifests/telemetry.pp
+++ b/manifests/telemetry.pp
@@ -68,7 +68,6 @@
 #   (optional) the keystone region of this node
 #   Defaults to 'RegionOne'
 #
-
 class cloud::telemetry(
   $ceilometer_secret          = 'ceilometersecret',
   $rabbit_hosts               = ['127.0.0.1:5672'],
diff --git a/manifests/telemetry/alarmevaluator.pp b/manifests/telemetry/alarmevaluator.pp
index 4308850b..9f435f75 100644
--- a/manifests/telemetry/alarmevaluator.pp
+++ b/manifests/telemetry/alarmevaluator.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry Alarm Evaluator nodes
 #
-
 class cloud::telemetry::alarmevaluator(
 ){
 
diff --git a/manifests/telemetry/alarmnotifier.pp b/manifests/telemetry/alarmnotifier.pp
index f07ca932..59bcd6e1 100644
--- a/manifests/telemetry/alarmnotifier.pp
+++ b/manifests/telemetry/alarmnotifier.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry Alarm Notifier nodes
 #
-
 class cloud::telemetry::alarmnotifier(
 ){
 
diff --git a/manifests/telemetry/api.pp b/manifests/telemetry/api.pp
index f0716ca6..e243e640 100644
--- a/manifests/telemetry/api.pp
+++ b/manifests/telemetry/api.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry API nodes
 #
-
 class cloud::telemetry::api(
   $ks_keystone_internal_host      = '127.0.0.1',
   $ks_keystone_internal_proto     = 'http',
diff --git a/manifests/telemetry/centralagent.pp b/manifests/telemetry/centralagent.pp
index c426a091..72a66cfe 100644
--- a/manifests/telemetry/centralagent.pp
+++ b/manifests/telemetry/centralagent.pp
@@ -16,7 +16,6 @@
 # Telemetry Central Agent node (should be run once)
 # Could be managed by spof node as Active / Passive.
 #
-
 class cloud::telemetry::centralagent(
   $enabled = true,
 ){
diff --git a/manifests/telemetry/collector.pp b/manifests/telemetry/collector.pp
index a28f44c8..9bffb0a4 100644
--- a/manifests/telemetry/collector.pp
+++ b/manifests/telemetry/collector.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry Collector nodes
 #
-
 class cloud::telemetry::collector(
   $mongo_nodes        = ['127.0.0.1:27017'],
   $replicaset_enabled = true,
diff --git a/manifests/telemetry/notification.pp b/manifests/telemetry/notification.pp
index 64aef569..e6281d47 100644
--- a/manifests/telemetry/notification.pp
+++ b/manifests/telemetry/notification.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry Notifications nodes
 #
-
 class cloud::telemetry::notification {
 
   include 'cloud::telemetry'
diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp
index dc077116..cf7d160a 100644
--- a/manifests/telemetry/server.pp
+++ b/manifests/telemetry/server.pp
@@ -15,7 +15,6 @@
 #
 # Telemetry server nodes
 #
-
 class cloud::telemetry::server(
   $ks_keystone_internal_host      = '127.0.0.1',
   $ks_keystone_internal_proto     = 'http',
diff --git a/manifests/volume.pp b/manifests/volume.pp
index f8efe1a3..4ee5f8ee 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -56,7 +56,6 @@
 #   (optional) Syslog facility to receive log lines
 #   Defaults to 'LOG_LOCAL0'
 #
-
 class cloud::volume(
   $cinder_db_host             = '127.0.0.1',
   $cinder_db_user             = 'cinder',
diff --git a/manifests/volume/api.pp b/manifests/volume/api.pp
index f9f83173..e98428f6 100644
--- a/manifests/volume/api.pp
+++ b/manifests/volume/api.pp
@@ -15,7 +15,6 @@
 #
 # Volume API node
 #
-
 class cloud::volume::api(
   $ks_cinder_internal_port     = 8776,
   $ks_cinder_password          = 'cinderpassword',
diff --git a/manifests/volume/backend/emc_vnx.pp b/manifests/volume/backend/emc_vnx.pp
index 577eab8f..4251d897 100644
--- a/manifests/volume/backend/emc_vnx.pp
+++ b/manifests/volume/backend/emc_vnx.pp
@@ -43,7 +43,6 @@
 #   (optional) Default max number of LUNs in a storage group.
 #   Defaults to: '256'
 #
-
 define cloud::volume::backend::emc_vnx (
   $iscsi_ip_address,
   $san_ip,
diff --git a/manifests/volume/backend/iscsi.pp b/manifests/volume/backend/iscsi.pp
index 5bd28671..9e8da91d 100644
--- a/manifests/volume/backend/iscsi.pp
+++ b/manifests/volume/backend/iscsi.pp
@@ -25,7 +25,6 @@
 #   (optional) Cinder volume group name.
 #   Defaults to 'cinder-volumes'.
 #
-
 define cloud::volume::backend::iscsi (
   $iscsi_ip_address,
   $volume_group        = 'cinder-volumes',
diff --git a/manifests/volume/backend/netapp.pp b/manifests/volume/backend/netapp.pp
index 68038eba..273f84f1 100644
--- a/manifests/volume/backend/netapp.pp
+++ b/manifests/volume/backend/netapp.pp
@@ -111,7 +111,6 @@
 #   (optional) File with the list of available NFS shares
 #   Defaults to ''
 #
-
 define cloud::volume::backend::netapp (
   $netapp_login,
   $netapp_password,
diff --git a/manifests/volume/backend/nfs.pp b/manifests/volume/backend/nfs.pp
index 4b8e719a..0007dddd 100644
--- a/manifests/volume/backend/nfs.pp
+++ b/manifests/volume/backend/nfs.pp
@@ -55,7 +55,6 @@
 #   destination will no longer be valid.
 #   Defaults to 1.0
 #
-
 define cloud::volume::backend::nfs(
   $volume_backend_name = $name,
   $nfs_servers = [],
diff --git a/manifests/volume/backend/rbd.pp b/manifests/volume/backend/rbd.pp
index 04392b06..cf33d08b 100644
--- a/manifests/volume/backend/rbd.pp
+++ b/manifests/volume/backend/rbd.pp
@@ -50,7 +50,6 @@
 #   A value of zero disables cloning
 #   Defaults to '5'
 #
-
 define cloud::volume::backend::rbd (
   $rbd_pool,
   $rbd_user,
diff --git a/manifests/volume/backup.pp b/manifests/volume/backup.pp
index d8645e3b..3982cc31 100644
--- a/manifests/volume/backup.pp
+++ b/manifests/volume/backup.pp
@@ -15,7 +15,6 @@
 #
 # Volume Backup node
 #
-
 class cloud::volume::backup(
   $backup_ceph_pool = 'backup',
   $backup_ceph_user = 'cinder'
diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp
index 9cf79f0b..5636f3c9 100644
--- a/manifests/volume/controller.pp
+++ b/manifests/volume/controller.pp
@@ -15,7 +15,6 @@
 #
 # Volume controller
 #
-
 class cloud::volume::controller(
   $ks_cinder_internal_port     = 8776,
   $ks_cinder_password          = 'cinderpassword',
diff --git a/manifests/volume/scheduler.pp b/manifests/volume/scheduler.pp
index dafcede5..d1af45d8 100644
--- a/manifests/volume/scheduler.pp
+++ b/manifests/volume/scheduler.pp
@@ -15,7 +15,6 @@
 #
 # Volume Scheduler node
 #
-
 class cloud::volume::scheduler(
   # Maintain backward compatibility for multi-backend
   $volume_multi_backend = false
diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index 7929a4b9..33b55843 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -47,8 +47,6 @@
 #   }
 #   Defaults to undef to maintain backward compatibility.
 #
-
-
 class cloud::volume::storage(
   $cinder_backends                         = undef,
   $ks_keystone_internal_proto              = 'http',