diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp
index 8322e3e94..5d2a154b0 100644
--- a/manifests/repo/rhel.pp
+++ b/manifests/repo/rhel.pp
@@ -1,19 +1,18 @@
 class rabbitmq::repo::rhel (
-    $key = "http://www.rabbitmq.com/rabbitmq-signing-key-public.asc",
-    $version = "2.8.4",
-    $relversion = "1",
-) { 
-    exec { "rpm --import ${key}":
-        path    => ["/bin","/usr/bin","/sbin","/usr/sbin"],
-        onlyif  => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0';
-    }
+  $key = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc',
+  $version = '2.8.4',
+  $relversion = '1',
+) {
+  exec { "rpm --import ${key}":
+    path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+    onlyif => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0';
+  }
 
-    package { "rabbitmq-server":
-        provider => rpm,
-        ensure => installed,
-        source => "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/rabbitmq-server-${version}-${relversion}.noarch.rpm",
-        require => Exec["rpm --import ${key}"],
-    }
+  package { 'rabbitmq-server':
+    ensure   => installed,
+    provider => rpm,
+    source   => "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/rabbitmq-server-${version}-${relversion}.noarch.rpm",
+    require  => Exec["rpm --import ${key}"],
+  }
 
 }
-
diff --git a/manifests/server.pp b/manifests/server.pp
index acfaa9989..baa167147 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -18,7 +18,7 @@
 #  [*cluster_disk_nodes*] - which nodes to cluster with (including the current one)
 #  [*erlang_cookie*] - erlang cookie, must be the same for all nodes in a cluster
 #  [*wipe_db_on_cookie_change*] - whether to wipe the RabbitMQ data if the specified
-#    erlang_cookie differs from the current one. This is a sad parameter: actually, 
+#    erlang_cookie differs from the current one. This is a sad parameter: actually,
 #    if the cookie indeed differs, then wiping the database is the *only* thing you
 #    can do. You're only required to set this parameter to true as a sign that you
 #    realise this.
@@ -95,9 +95,9 @@
 
   if $config_cluster {
     file { 'erlang_cookie':
-      path =>"/var/lib/rabbitmq/.erlang.cookie",
-      owner   => rabbitmq,
-      group   => rabbitmq,
+      path    => '/var/lib/rabbitmq/.erlang.cookie',
+      owner   => 'rabbitmq',
+      group   => 'rabbitmq',
       mode    => '0400',
       content => $erlang_cookie,
       replace => true,
diff --git a/tests/full.pp b/tests/full.pp
index 2f6a66622..c6dfc5cf0 100644
--- a/tests/full.pp
+++ b/tests/full.pp
@@ -1,4 +1,4 @@
-class { 'rabbitmq::repo::apt': 
+class { 'rabbitmq::repo::apt':
   pin => '900',
 }->
 class { 'rabbitmq::server':
@@ -10,12 +10,12 @@
   password => 'pass',
   provider => 'rabbitmqctl',
 }->
-rabbitmq_vhost { 'myhost': 
+rabbitmq_vhost { 'myhost':
   provider => 'rabbitmqctl',
 }
 rabbitmq_user_permissions { 'dan@myhost':
   configure_permission => '.*',
   read_permission      => '.*',
   write_permission     => '.*',
-  provider => 'rabbitmqctl',
+  provider             => 'rabbitmqctl',
 }
diff --git a/tests/permissions/add.pp b/tests/permissions/add.pp
index 865347f67..fb71af143 100644
--- a/tests/permissions/add.pp
+++ b/tests/permissions/add.pp
@@ -4,6 +4,6 @@
 rabbitmq_vhost { 'test5': }
 rabbitmq_user_permissions { 'blah7@test5':
   configure_permission => 'config2',
-  read_permission => 'ready',
-  #write_permission => 'ready',
+  read_permission      => 'ready',
+  #write_permission     => 'ready',
 }
diff --git a/tests/plugin.pp b/tests/plugin.pp
index 77e07b8fe..6c5605b9e 100644
--- a/tests/plugin.pp
+++ b/tests/plugin.pp
@@ -2,7 +2,7 @@
     config_stomp => true,
 }
 
-$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ] 
+$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
 
 rabbitmq_plugin { $rabbitmq_plugins:
   ensure   => present,
diff --git a/tests/server.pp b/tests/server.pp
index 89ff4655e..caea89377 100644
--- a/tests/server.pp
+++ b/tests/server.pp
@@ -1,5 +1,5 @@
 class { 'rabbitmq::server':
-  port => '5672',
+  port              => '5672',
   delete_guest_user => true,
-  version => 'latest',
+  version           => 'latest',
 }
diff --git a/tests/user/add.pp b/tests/user/add.pp
index 3479c84f1..2c3a87096 100644
--- a/tests/user/add.pp
+++ b/tests/user/add.pp
@@ -1,4 +1,4 @@
 rabbitmq_user { ['blah2', 'blah3', 'blah4']:
   password => 'phoey!',
- # provider => 'rabbitmqctl',
+  #provider => 'rabbitmqctl',
 }