diff --git a/manifests/common.pp b/manifests/common.pp
index fcd4e95..b3571a6 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -27,7 +27,7 @@ class puppet::common ($ensure = 'present') {
   }
 
   # add facter variable to custom facts.
-  file { "/etc/profile.d/puppet.sh":
+  file { '/etc/profile.d/puppet.sh':
     content => "export FACTERLIB=\"${factpath}\"\n",
   }
 }
diff --git a/manifests/defines/env_fact.pp b/manifests/defines/env_fact.pp
index 06ff993..f3add55 100644
--- a/manifests/defines/env_fact.pp
+++ b/manifests/defines/env_fact.pp
@@ -1,28 +1,23 @@
-# $Id: env_fact.pp 2479 2009-05-16 12:02:33Z uwaechte $
-
-define puppet::env_fact(
-    $factname="",
-    $value,
-    $ensure="present"  
-    ){
+define puppet::defines::env_fact ($value, $factname = '', $ensure = 'present') {
   $factname_real = $factname ? {
-    "" => upcase($name),
+    ''      => upcase($name),
     default => upcase($factname)
   }
-  if defined(Exec["create-env_fact.sh"]){
-    debug("already defined.") 
-  }else{
-    exec{"create-env_fact.sh":
-      command => "echo \"#/bin/sh\n\" >>/etc/profile.d/env_facts.sh && chmod a+xr /etc/profile.d/env_facts.sh",
-      onlyif => "test ! -e /etc/profile.d/env_facts.sh",
-      before => Line["env_fact-${factname_real}"],
-      path => ["/usr/bin", "/bin" ],
+
+  if defined(Exec['create-env_fact.sh']) {
+    debug('already defined.')
+  } else {
+    exec { 'create-env_fact.sh':
+      command => 'echo \'#/bin/sh\n\' >>/etc/profile.d/env_facts.sh && chmod a+xr /etc/profile.d/env_facts.sh',
+      onlyif  => 'test ! -e /etc/profile.d/env_facts.sh',
+      before  => Line["env_fact-${factname_real}"],
+      path    => ['/usr/bin', '/bin'],
     }
   }
 
-  line{"env_fact-${factname_real}":
-    line => "export FACTER_${factname_real}=${value}",
-    file => "/etc/profile.d/env_facts.sh",
+  common::line { "env_fact-${factname_real}":
+    line   => "export FACTER_${factname_real}=${value}",
+    file   => '/etc/profile.d/env_facts.sh',
     ensure => $ensure,
   }
 }
diff --git a/manifests/defines/fact_d.pp b/manifests/defines/fact_d.pp
index 769b206..e442aa4 100644
--- a/manifests/defines/fact_d.pp
+++ b/manifests/defines/fact_d.pp
@@ -1,4 +1,4 @@
-define puppet::defines::fact_d ($ensure = 'present', $key = false, $value) {
+define puppet::defines::fact_d ($value, $ensure = 'present', $key = false) {
   require 'puppet::common'
   $k_real = $key ? {
     false   => $name,
@@ -6,7 +6,7 @@ define puppet::defines::fact_d ($ensure = 'present', $key = false, $value) {
   }
 
   file { "${puppet::common::facts_d}/${k_real}.txt":
-    content => "${k_real}=${value}",
     ensure  => $ensure,
+    content => "${k_real}=${value}",
   }
 }
diff --git a/manifests/puppetlabs_apt.pp b/manifests/puppetlabs_apt.pp
index 479da40..2df5a0a 100644
--- a/manifests/puppetlabs_apt.pp
+++ b/manifests/puppetlabs_apt.pp
@@ -1,8 +1,8 @@
 class puppet::puppetlabs_apt ($ensure = 'present') {
   apt::source { 'puppetlabs':
+    ensure   => $ensure,
     key      => '4BD6EC30',
     location => 'http://apt.puppetlabs.com',
     repos    => 'main',
-    ensure   => $ensure,
   }
 }
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index e0d7a9f..4260b5a 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -1,4 +1,4 @@
-class puppet::puppetmaster ($ensure = "present", $puppetqd = false) {
+class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
   require 'puppet::common'
 
   if !defined(Class['puppet::puppetlabs_apt']) {
@@ -7,37 +7,37 @@ class puppet::puppetmaster ($ensure = "present", $puppetqd = false) {
   }
 
   if $puppetqd {
-    class { "activemq": ensure => $ensure }
+    class { 'activemq': ensure => $ensure }
 
-    package { "libnet-arp-perl": ensure => $ensure }
+    package { 'libnet-arp-perl': ensure => $ensure }
 
-    service { "stompserver":
+    service { 'stompserver':
       ensure => false,
       enable => false,
-      before => Class["activemq"],
+      before => Class['activemq'],
     }
 
-    service { "puppetqd":
+    service { 'puppetqd':
       ensure  => running,
-      pattern => "puppet queue queue",
+      pattern => 'puppet queue queue',
       enable  => true,
     }
   }
 
   if defined(Class['ganglia']) {
     Ganglia::Gmetric::Cron {
-      source => "puppet/ganglia",
-      ensure => "${ensure}",
+      source => 'puppet/ganglia',
+      ensure => $ensure,
     }
 
-    ganglia::gmetric::cron { "puppetmaster.rb": runwhen => "5", }
+    ganglia::gmetric::cron { 'puppetmaster.rb': runwhen => '5', }
 
-    ganglia::gmetric::cron { "puppetmaster_compiletime.rb": runwhen => "60", }
+    ganglia::gmetric::cron { 'puppetmaster_compiletime.rb': runwhen => '60', }
   }
 
   # ## remove disk reports from time to time
-  tidy { "${puppet_vardir}/reports":
-    age     => "1d",
+  tidy { "${::puppet_vardir}/reports":
+    age     => '1d',
     recurse => true,
     backup  => false,
   }