diff --git a/manifests/config.pp b/manifests/config.pp
index 2795cd073..19d6de52e 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,3 +1,6 @@
+# Class: rabbitmq::config
+# Sets all the configuration values for RabbitMQ and creates the directories for
+# config and ssl.
 class rabbitmq::config {
 
   $admin_enable               = $rabbitmq::admin_enable
diff --git a/manifests/init.pp b/manifests/init.pp
index 68dbc8d26..3d881df38 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,4 @@
-  #
+# Main rabbitmq class
 class rabbitmq(
   $admin_enable               = $rabbitmq::params::admin_enable,
   $cluster_disk_nodes         = $rabbitmq::params::cluster_disk_nodes,
@@ -142,9 +142,9 @@
     include '::rabbitmq::install::rabbitmqadmin'
 
     rabbitmq_plugin { 'rabbitmq_management':
-      ensure  => present,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
+      ensure   => present,
+      require  => Class['rabbitmq::install'],
+      notify   => Class['rabbitmq::service'],
       provider => 'rabbitmqplugins'
     }
 
@@ -153,9 +153,9 @@
 
   if $stomp_ensure {
     rabbitmq_plugin { 'rabbitmq_stomp':
-      ensure  => present,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
+      ensure   => present,
+      require  => Class['rabbitmq::install'],
+      notify   => Class['rabbitmq::service'],
       provider => 'rabbitmqplugins'
     }
   }
diff --git a/manifests/install.pp b/manifests/install.pp
index 09fe3b321..65675ac75 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -1,3 +1,5 @@
+# Class rabbitmq::install
+# Ensures the rabbitmq-server exists
 class rabbitmq::install {
 
   $package_ensure   = $rabbitmq::package_ensure
diff --git a/manifests/params.pp b/manifests/params.pp
index abe7c52b7..a5a21170c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -82,11 +82,11 @@
   $ssl_management_port        = '15671'
   $ssl_stomp_port             = '6164'
   $ssl_verify                 = 'verify_none'
-  $ssl_fail_if_no_peer_cert   = 'false'
+  $ssl_fail_if_no_peer_cert   = false
   $stomp_ensure               = false
   $ldap_auth                  = false
   $ldap_server                = 'ldap'
-  $ldap_user_dn_pattern       = 'cn=${username},ou=People,dc=example,dc=com'
+  $ldap_user_dn_pattern       = "cn=${username},ou=People,dc=example,dc=com"
   $ldap_use_ssl               = false
   $ldap_port                  = '389'
   $ldap_log                   = false
diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp
index f2271cd46..9a68088a0 100644
--- a/manifests/repo/rhel.pp
+++ b/manifests/repo/rhel.pp
@@ -1,3 +1,5 @@
+# Class: rabbitmq::repo::rhel
+# Imports the gpg key if it doesn't already exist.
 class rabbitmq::repo::rhel {
 
   $package_gpg_key = $rabbitmq::package_gpg_key