diff --git a/manifests/conf.pp b/manifests/conf.pp
index b1fb9e3..6b10c3f 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -1,118 +1,118 @@
 # Define: sudo::conf
 #
 # This module manages sudo configurations
 #
 # Parameters:
 #   [*ensure*]
 #     Ensure if present or absent.
 #     Default: present
 #
 #   [*priority*]
 #     Prefix file name with $priority
 #     Default: 10
 #
 #   [*content*]
 #     Content of configuration snippet.
 #     Default: undef
 #
 #   [*source*]
 #     Source of configuration snippet.
 #     Default: undef
 #
 #   [*sudo_config_dir*]
 #     Where to place configuration snippets.
 #     Only set this, if your platform is not supported or
 #     you know, what you're doing.
 #     Default: auto-set, platform specific
 #
 # Actions:
 #   Installs sudo configuration snippets
 #
 # Requires:
 #   Class sudo
 #
 # Sample Usage:
 #   sudo::conf { 'admins':
 #     source => 'puppet:///files/etc/sudoers.d/admins',
 #   }
 #
 # [Remember: No empty lines between comments and class definition]
 define sudo::conf(
   $ensure          = present,
   $priority        = 10,
   $content         = undef,
   $source          = undef,
   $sudo_config_dir = undef,
   $sudo_file_name  = undef
   ) {
 
   include sudo
 
   # Hack to allow the user to set the config_dir from the
   # sudo::config parameter, but default to $sudo::params::config_dir
   # if it is not provided. $sudo::params isn't included before
   # the parameters are loaded in.
   $sudo_config_dir_real = $sudo_config_dir ? {
     undef            => $sudo::params::config_dir,
     $sudo_config_dir => $sudo_config_dir
   }
 
   # sudo skip file name that contain a "."
   $dname = regsubst($name, '\.', '-', 'G')
 
   # build current file name with path
   if $sudo_file_name != undef {
     $cur_file = "${sudo_config_dir_real}${sudo_file_name}"
   } else {
     $cur_file = "${sudo_config_dir_real}${priority}_${dname}"
   }
 
   Class['sudo'] -> Sudo::Conf[$name]
 
   if $::osfamily == 'RedHat' {
     if (versioncmp($::sudoversion, '1.7.2p1') < 0) {
-      warning("Found sudo with version $::sudoversion, but at least version 1.7.2p1 is required!")
+      warning("Found sudo with version ${::sudoversion}, but at least version 1.7.2p1 is required!")
     }
   }
 
   if $content != undef {
     if is_array($content) {
       $content_real = join($content, "\n")
     } else {
       $content_real = $content
     }
 
   } else {
     $content_real = undef
   }
 
   if $ensure == 'present' {
     $notify_real = Exec["sudo-syntax-check for file ${cur_file}"]
   } else {
     $notify_real = undef
   }
 
   file { "${priority}_${dname}":
     ensure  => $ensure,
     path    => $cur_file,
     owner   => 'root',
     group   => $sudo::params::config_file_group,
     mode    => '0440',
     source  => $source,
     content => "${content_real}\n",
     notify  => $notify_real,
   }
 
   exec {"sudo-syntax-check for file ${cur_file}":
     command     => "visudo -c || ( rm -f '${cur_file}' && exit 1)",
     refreshonly => true,
     path        => [
       '/bin',
       '/sbin',
       '/usr/bin',
       '/usr/sbin',
       '/usr/local/bin',
       '/usr/local/sbin'
     ],
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 3c6fda4..0ae9570 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,162 +1,162 @@
 #class sudo::params 
 #Set the paramters for the sudo module
 class sudo::params {
   $source_base = "puppet:///modules/${module_name}/"
 
   case $::osfamily {
     debian: {
       case $::operatingsystem {
         'Ubuntu': {
           $source = "${source_base}sudoers.ubuntu"
         }
         default: {
 
           case $::lsbdistcodename {
             'wheezy': {
               $source = "${source_base}sudoers.wheezy"
             }
             default: {
               $source = "${source_base}sudoers.deb"
             }
           }
         }
       }
       $package           = 'sudo'
       $package_ensure    = 'present'
       $package_source    = ''
       $package_admin_file = ''
       $config_file       = '/etc/sudoers'
       $config_dir        = '/etc/sudoers.d/'
       $config_file_group = 'root'
     }
     redhat: {
       $package = 'sudo'
 
       # rhel 5.0 to 5.4 use sudo 1.6.9 which does not support
       # includedir, so we have to make sure sudo 1.7 (comes with rhel
       # 5.5) is installed.
       $package_ensure = $::operatingsystemrelease ? {
-        /^5.[01234]/ => "latest",
-        default     => "present",
+        /^5.[01234]/ => 'latest',
+        default      => 'present',
       }
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d/'
       $source = $::operatingsystemrelease ? {
         /^5/    => "${source_base}sudoers.rhel5",
         /^6/    => "${source_base}sudoers.rhel6",
         default => "${source_base}sudoers.rhel6",
         }
       $config_file_group = 'root'
     }
     suse: {
       $package = 'sudo'
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d/'
       $source = "${source_base}sudoers.suse"
       $config_file_group = 'root'
     }
     solaris: {
       case $::operatingsystem {
         'OmniOS': {
           $package = 'sudo'
           $package_ensure = 'present'
           $package_source = ''
           $package_admin_file = ''
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d/'
           $source = "${source_base}sudoers.omnios"
           $config_file_group = 'root'
         }
         default: {
           case $::kernelrelease {
             '5.11': {
               $package = 'pkg://solaris/security/sudo'
               $package_ensure = 'present'
               $package_source = ''
               $package_admin_file = ''
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d/'
               $source = "${source_base}sudoers.solaris"
               $config_file_group = 'root'
             }
             '5.10': {
               $package = 'TCMsudo'
               $package_ensure = 'present'
               $package_source = 'http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.9p5-i386.pkg.gz'
               $package_admin_file = '/var/sadm/install/admin/puppet'
               $config_file = '/etc/sudoers'
               $config_dir = '/etc/sudoers.d/'
               $source = "${source_base}sudoers.solaris"
               $config_file_group = 'root'
             }
             default: {
               fail("Unsupported platform: ${::osfamily}/${::operatingsystem}/${::kernelrelease}")
             }
           }
         }
       }
     }
     freebsd: {
       $package = 'security/sudo'
       $package_ensure = 'present'
       $package_source = ''
       $package_admin_file = ''
       $config_file = '/usr/local/etc/sudoers'
       $config_dir = '/usr/local/etc/sudoers.d/'
       $source = "${source_base}sudoers.freebsd"
       $config_file_group = 'wheel'
     }
     aix: {
       $package = 'sudo'
       $package_ensure = 'present'
       $package_source = 'http://www.sudo.ws/sudo/dist/packages/AIX/5.3/sudo-1.8.9-6.aix53.lam.rpm'
       $package_admin_file = ''
       $config_file = '/etc/sudoers'
       $config_dir = '/etc/sudoers.d/'
       $source = "${source_base}sudoers.aix"
       $config_file_group = 'system'
     }
     default: {
       case $::operatingsystem {
         gentoo: {
           $package = 'sudo'
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d/'
           $source = "${source_base}sudoers.deb"
           $config_file_group = 'root'
         }
         archlinux: {
           $package = 'sudo'
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d/'
           $source = "${source_base}sudoers.archlinux"
           $config_file_group = 'root'
         }
         amazon: {
           $package = 'sudo'
           $package_ensure = 'present'
           $config_file = '/etc/sudoers'
           $config_dir = '/etc/sudoers.d/'
           $source = $::operatingsystemrelease ? {
             /^5/    => "${source_base}sudoers.rhel5",
             /^6/    => "${source_base}sudoers.rhel6",
             default => "${source_base}sudoers.rhel6",
           }
           $config_file_group = 'root'
         }
         default: {
           fail("Unsupported platform: ${::osfamily}/${::operatingsystem}")
         }
       }
       $package_source = ''
       $package_admin_file = ''
     }
   }
 }