diff --git a/modules/lodgeit/manifests/init.pp b/modules/lodgeit/manifests/init.pp
index a69a1af220..f9023b8bb5 100644
--- a/modules/lodgeit/manifests/init.pp
+++ b/modules/lodgeit/manifests/init.pp
@@ -1,52 +1,56 @@
+# == Class: lodgeit
+#
 class lodgeit {
-  $packages = [ "python-imaging",
-                "python-jinja2",
-                "python-pybabel",
-                "python-werkzeug",
-                "python-simplejson",
-                "python-pygments",
-                "drizzle",
-                "python-mysqldb" ]
+  $packages = [ 'python-imaging',
+                'python-jinja2',
+                'python-pybabel',
+                'python-werkzeug',
+                'python-simplejson',
+                'python-pygments',
+                'drizzle',
+                'python-mysqldb' ]
 
   include apache
 
   include pip
   a2mod { 'proxy':
-    ensure => present
+    ensure => present,
   }
   a2mod { 'proxy_http':
-    ensure => present
+    ensure => present,
   }
 
-  package { $packages: ensure => present }
+  package { $packages:
+    ensure => present,
+  }
 
   package { 'SQLAlchemy':
+    ensure   => present,
     provider => pip,
-    ensure => present,
-    require => Class[pip]
+    require  => Class[pip],
   }
 
   file { '/srv/lodgeit':
-    ensure => directory
+    ensure => directory,
   }
 
   service { 'drizzle':
-    ensure => running,
-    hasrestart => true
+    ensure     => running,
+    hasrestart => true,
   }
 
-  vcsrepo { "/tmp/lodgeit-main":
-    ensure => latest,
+  vcsrepo { '/tmp/lodgeit-main':
+    ensure   => latest,
     provider => git,
-    source => "https://github.com/openstack-ci/lodgeit.git",
+    source   => 'https://github.com/openstack-ci/lodgeit.git',
   }
 
 # create initial git DB backup location
 
-  exec { "create_db_backup":
-    command => "git init /var/backups/lodgeit_db",
-    path => "/bin:/usr/bin",
-    onlyif => "test ! -d /var/backups/lodgeit_db"
+  exec { 'create_db_backup':
+    command => 'git init /var/backups/lodgeit_db',
+    path    => '/bin:/usr/bin',
+    onlyif  => 'test ! -d /var/backups/lodgeit_db',
   }
 
 }
diff --git a/modules/lodgeit/manifests/site.pp b/modules/lodgeit/manifests/site.pp
index 82f57d7636..ed9e7ed126 100644
--- a/modules/lodgeit/manifests/site.pp
+++ b/modules/lodgeit/manifests/site.pp
@@ -1,75 +1,87 @@
-define lodgeit::site($vhost_name="paste.$name.org", $port, $image="") {
+# == Define: site
+#
+
+define lodgeit::site(
+  $port,
+  $vhost_name="paste.${name}.org",
+  $image='') {
 
   include remove_nginx
 
   apache::vhost::proxy { $vhost_name:
-    port => 80,
-    dest => "http://localhost:$port",
+    port    => 80,
+    dest    => "http://localhost:${port}",
     require => File["/srv/lodgeit/${name}"],
   }
 
   file { "/etc/init/${name}-paste.conf":
-    ensure => 'present',
-    content => template("lodgeit/upstart.erb"),
-    replace => 'true',
-    require => Package[nginx],
-    notify => Service["${name}-paste"]
+    ensure  => present,
+    content => template('lodgeit/upstart.erb'),
+    replace => true,
+    require => Package['nginx'],
+    notify  => Service["${name}-paste"],
   }
 
   file { "/srv/lodgeit/${name}":
-    ensure => directory,
+    ensure  => directory,
     recurse => true,
-    source => "/tmp/lodgeit-main"
+    source  => '/tmp/lodgeit-main',
   }
 
   if $image != '' {
     file { "/srv/lodgeit/${name}/lodgeit/static/${image}":
       ensure => present,
-      source => "puppet:///lodgeit/${image}"
+      source => "puppet:///lodgeit/${image}",
     }
   }
 
   file { "/srv/lodgeit/${name}/manage.py":
-    mode => 755,
+    ensure  => present,
+    mode    => '0755',
     replace => true,
-    content => template("lodgeit/manage.py.erb"),
-    notify => Service["${name}-paste"]
+    content => template('lodgeit/manage.py.erb'),
+    notify  => Service["${name}-paste"],
   }
 
   file { "/srv/lodgeit/${name}/lodgeit/views/layout.html":
+    ensure  => present,
     replace => true,
-    content => template("lodgeit/layout.html.erb")
+    content => template('lodgeit/layout.html.erb'),
   }
 
   exec { "create_database_${name}":
-    command => "drizzle --user=root -e \"create database if not exists ${name};\"",
-    path => "/bin:/usr/bin",
-    unless => "drizzle --disable-column-names -r --batch -e \"show databases like 'openstack'\" | grep openstack >/dev/null",
-    require => Service["drizzle"]
+    command => "drizzle --user=root \
+                -e \"create database if not exists ${name};\"",
+    path    => '/bin:/usr/bin',
+    unless  => 'drizzle --disable-column-names -r --batch \
+                -e "show databases like \'openstack\'" | grep -q openstack',
+    require => Service['drizzle'],
   }
 
 # create a backup .sql file in git
 
   exec { "create_db_backup_${name}":
-    command => "touch ${name}.sql && git add ${name}.sql && git commit -am \"Initial commit for ${name}\"",
-    cwd => "/var/backups/lodgeit_db/",
-    path => "/bin:/usr/bin",
-    onlyif => "test ! -f /var/backups/lodgeit_db/${name}.sql"
+    command => "touch ${name}.sql && git add ${name}.sql && git commit \
+                -am \"Initial commit for ${name}\"",
+    cwd     => '/var/backups/lodgeit_db/',
+    path    => '/bin:/usr/bin',
+    onlyif  => "test ! -f /var/backups/lodgeit_db/${name}.sql",
   }
 
 # cron to take a backup and commit it in git
 
   cron { "update_backup_${name}":
-    user => root,
-    hour => 6,
-    minute => 23,
-    command => "sleep $((RANDOM\\%60+60)) && cd /var/backups/lodgeit_db && drizzledump -uroot ${name} > ${name}.sql && git commit -qam \"Updating DB backup for ${name}\""
+    user    => root,
+    hour    => 6,
+    minute  => 23,
+    command => "sleep $((RANDOM\\%60+60)) && cd /var/backups/lodgeit_db \
+                && drizzledump -uroot ${name} > ${name}.sql \
+                && git commit -qam \"Updating DB backup for ${name}\""
   }
 
   service { "${name}-paste":
+    ensure   => running,
     provider => upstart,
-    ensure => running,
-    require => [Service["drizzle", "nginx"], Exec["create_database_${name}"]]
+    require  => [Service['drizzle', 'nginx'], Exec["create_database_${name}"]],
   }
-
 }