diff --git a/manifests/init.pp b/manifests/init.pp
index a64a106c1..4912df268 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,8 @@
 # [*core_plugin*]
 #   (optional) Neutron plugin provider
 #   Defaults to openvswitch
-#   Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet, ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail (full path)
+#   Could be bigswitch, brocade, cisco, embrane, hyperv, linuxbridge, midonet,
+#   ml2, mlnx, nec, nicira, plumgrid, ryu, nuage, opencontrail (full path)
 #
 #   Example for opencontrail:
 #
@@ -491,10 +492,12 @@ class neutron (
     }
   }
 
-  if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile)) or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) {
+  if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile))
+      or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) {
     fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
   }
-  if ! is_service_default($kombu_missing_consumer_retry_timeout) and ! is_service_default($rpc_response_timeout) and ($kombu_missing_consumer_retry_timeout > $rpc_response_timeout) {
+  if ! is_service_default($kombu_missing_consumer_retry_timeout) and ! is_service_default($rpc_response_timeout)
+      and ($kombu_missing_consumer_retry_timeout > $rpc_response_timeout) {
     warning('kombu_missing_consumer_retry_timeout should not be longer than rpc_response_timeout')
   }
 
diff --git a/manifests/quota.pp b/manifests/quota.pp
index 1e60d5ca5..9be315aee 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -111,7 +111,6 @@ class neutron::quota (
   $quota_vip                 = $::os_service_default,
   #DEPRECATED PAMAMETERS
   $quota_items               = undef,
-  
 ) {
 
   include ::neutron::deps
diff --git a/manifests/server.pp b/manifests/server.pp
index fc5af5a10..a83c042fe 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -395,7 +395,9 @@ class neutron::server (
   }
 
   if !is_service_default($dhcp_load_type) {
-    validate_re($dhcp_load_type, ['^networks$', '^subnets$', '^ports$'], 'Must pass either networks, subnets, or ports as values for dhcp_load_type')
+    validate_re($dhcp_load_type,
+                ['^networks$', '^subnets$', '^ports$'],
+                'Must pass either networks, subnets, or ports as values for dhcp_load_type')
   }
 
   if !is_service_default($service_providers) {
diff --git a/manifests/services/lbaas.pp b/manifests/services/lbaas.pp
index 180c84d0d..04dfbb879 100644
--- a/manifests/services/lbaas.pp
+++ b/manifests/services/lbaas.pp
@@ -87,7 +87,8 @@ class neutron::services::lbaas (
   }
 
   if !is_service_default($service_providers) {
-    warning('service_providers in neutron::services::lbaas is deprecated in newton release, please use service provider in neutron::server class')
+    warning('service_providers in neutron::services::lbaas is deprecated in newton \
+            release, please use service provider in neutron::server class')
   }
 
   if $package_ensure {
diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp
index ba5e0d6d3..561e84298 100644
--- a/manifests/services/vpnaas.pp
+++ b/manifests/services/vpnaas.pp
@@ -45,7 +45,8 @@ class neutron::services::vpnaas (
 
   include ::neutron::params
   if !is_service_default($service_providers) {
-    warning('service_providers in neutron::services::vpnaas is deprecated in newton release, please use service provider in neutron::server class')
+    warning('service_providers in neutron::services::vpnaas is deprecated in newton release, \
+            please use service provider in neutron::server class')
   }
 
   # agent package contains both agent and service resources