diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..86437b8
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack-dev/devstack-vagrant.git
diff --git a/puppet/manifests/cleanup.pp b/puppet/manifests/cleanup.pp
index 391160c..211b8d0 100644
--- a/puppet/manifests/cleanup.pp
+++ b/puppet/manifests/cleanup.pp
@@ -1,19 +1,19 @@
 node default {
   $dir = '/home/stack/devstack'
 
-  file {"/etc/hostname":
+  file { '/etc/hostname':
     ensure => absent
   }
 
-  file {"/etc/udev/rules.d/70-persistent-net.rules":
+  file { '/etc/udev/rules.d/70-persistent-net.rules':
     ensure => absent
   }
 
-  exec {"clean.sh":
+  exec { 'clean.sh':
     cwd => $dir,
-    path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+    path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
     user => 'stack',
-    command => "$dir/clean.sh",
-    logoutput => "on_failure",
+    command => "${dir}/clean.sh",
+    logoutput => 'on_failure',
   }
 }
diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp
index b97360e..ce271e1 100644
--- a/puppet/manifests/default.pp
+++ b/puppet/manifests/default.pp
@@ -1,10 +1,10 @@
 node default {
   include base
   include user::stack
-  if $setup_mode == "grenade" {
+  if $setup_mode == 'grenade' {
     include grenade
   }
-  if $setup_mode == "devstack" {
+  if $setup_mode == 'devstack' {
     include devstack
   }
 }
diff --git a/puppet/modules/base/manifests/init.pp b/puppet/modules/base/manifests/init.pp
index 3d9ae6d..093b3be 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -1,27 +1,30 @@
+# == Class: base
+#
+
 class base {
 
-  $vim = $operatingsystem ? {
-    /RedHat|Fedora|Centos/ => "vim-enhanced",
-    default => "vim"
+  $vim = $::operatingsystem ? {
+    /RedHat|Fedora|Centos/ => 'vim-enhanced',
+    default => 'vim',
   }
 
-  $editors = ["joe", $vim]
-  $vcs = ["git"]
+  $editors = ['joe', $vim]
+  $vcs = ['git']
 
-  package {$editors:
+  package { $editors:
     ensure => latest
   }
 
-  package {$vcs:
+  package { $vcs:
     ensure => latest
   }
 
-  file { "/usr/local/bin/git_clone.sh":
-    owner => "root",
-    group => "root",
-    mode  => 755,
-    source => "puppet:///modules/base/git_clone.sh",
-    require => Package[$vcs]
+  file { '/usr/local/bin/git_clone.sh':
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/base/git_clone.sh',
+    require => Package[$vcs],
   }
 
 }
diff --git a/puppet/modules/devstack/manifests/init.pp b/puppet/modules/devstack/manifests/init.pp
index 5017ed0..a00533e 100644
--- a/puppet/modules/devstack/manifests/init.pp
+++ b/puppet/modules/devstack/manifests/init.pp
@@ -1,3 +1,6 @@
+# == Class: devstack
+#
+
 class devstack(
   $dir = '/home/stack/devstack'
 )
@@ -16,42 +19,42 @@ class devstack(
     $branch = 'master'
   }
 
-  exec { "devstack_clone":
-    require => File["/usr/local/bin/git_clone.sh"],
-    path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+  exec { 'devstack_clone':
+    require => File['/usr/local/bin/git_clone.sh'],
+    path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
     environment => "HOME=/home/$user",
     user => 'stack',
     group => 'stack',
     command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
     logoutput => true,
-    timeout => 1200
+    timeout => 1200,
   }
 
   file { "$dir/local.sh":
     owner => $user,
     group => $user,
-    mode  => 755,
-    source => "puppet:///modules/devstack/local.sh",
-    require => Exec[ "devstack_clone" ]
+    mode => '0755',
+    source => 'puppet:///modules/devstack/local.sh',
+    require => Exec['devstack_clone'],
   }
 
   file { "$dir/local.conf":
     owner => $user,
     group => $user,
-    mode  => 644,
+    mode => '0644',
     content => template('devstack/local.erb'),
-    require => File["$dir/local.sh"]
+    require => File["$dir/local.sh"],
   }
 
-  exec {"stack.sh":
-    require => [ File["$dir/local.conf"], File["$dir/local.sh"] ],
+  exec { 'stack.sh':
+    require => [File["$dir/local.conf"], File["$dir/local.sh"]],
     cwd => $dir,
-    path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+    path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
     environment => "HOME=/home/$user",
     user => 'stack',
     group => 'stack',
     command => "$dir/stack.sh",
     logoutput => true,
-    timeout => 0
+    timeout => 0,
   }
 }
diff --git a/puppet/modules/grenade/manifests/init.pp b/puppet/modules/grenade/manifests/init.pp
index 6444ffa..da7980a 100644
--- a/puppet/modules/grenade/manifests/init.pp
+++ b/puppet/modules/grenade/manifests/init.pp
@@ -1,3 +1,6 @@
+# == Class: grenade
+#
+
 class grenade(
   $dir = '/home/stack/grenade'
 )
@@ -16,15 +19,15 @@ class grenade(
     $branch = 'master'
   }
 
-  exec { "grenade_clone":
-    require => File["/usr/local/bin/git_clone.sh"],
-    path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+  exec { 'grenade_clone':
+    require => File['/usr/local/bin/git_clone.sh'],
+    path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
     environment => "HOME=/home/$user",
     user => 'stack',
     group => 'stack',
     command => "/usr/local/bin/git_clone.sh ${source} ${branch} ${dir}",
     logoutput => true,
-    timeout => 1200
+    timeout => 1200,
   }
 
   # file { "$dir/localrc":
@@ -35,10 +38,10 @@ class grenade(
   #   require => File["$dir/local.sh"]
   # }
 
-  exec {"grenade.sh":
-    require => [ Exec["grenade_clone"] ],
+  exec { 'grenade.sh':
+    require => Exec['grenade_clone'],
     cwd => $dir,
-    path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
+    path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.',
     environment => "HOME=/home/$user",
     user => 'stack',
     group => 'stack',
diff --git a/puppet/modules/user/manifests/create.pp b/puppet/modules/user/manifests/create.pp
index 59227b3..7d0321d 100644
--- a/puppet/modules/user/manifests/create.pp
+++ b/puppet/modules/user/manifests/create.pp
@@ -1,10 +1,13 @@
+# == Class: user::create
+#
+
 define user::create (
-  $user = "",
-  $pass = "",
-  $key = "",
-  $key_type = "rsa",
+  $user = '',
+  $pass = '',
+  $key = '',
+  $key_type = 'rsa',
   $home = "/home/${user}",
-  $is_admin = false
+  $is_admin = false,
 )
 {
   if $is_admin == true {
@@ -14,49 +17,49 @@ define user::create (
     $extra_groups = ['dialout']
   }
 
-  group {$extra_groups:
+  group { $extra_groups:
     ensure => present,
   } ->
 
-  group {$user:
+  group { $user:
     ensure => present,
   } ->
 
-  user {$user:
+  user { $user:
+    ensure => present,
     gid => $user,
     password => $pass,
     home => $home,
     groups => $extra_groups,
-    ensure => present,
-    shell => "/bin/bash"
+    shell => '/bin/bash'
   } ->
 
   file { $home:
+    ensure => directory,
     owner => $user,
     group => $user,
-    mode => 755,
-    ensure => directory,
+    mode => '0755',
   } ->
 
   file { "${home}/bin":
+    ensure => directory,
     owner => $user,
     group => $user,
-    mode => 755,
-    ensure => directory,
+    mode => '0755',
   } ->
 
   file { "${home}/.ssh":
+    ensure => directory,
     owner => $user,
     group => $user,
-    mode => 700,
-    ensure => directory,
+    mode => '0700',
   } ->
 
   ssh_authorized_key { $user:
+    ensure => present,
     key => $key,
     user => $user,
     type => $key_type,
-    ensure => present
   }
 
 }
diff --git a/puppet/modules/user/manifests/stack.pp b/puppet/modules/user/manifests/stack.pp
index 50095e9..4fd9b93 100644
--- a/puppet/modules/user/manifests/stack.pp
+++ b/puppet/modules/user/manifests/stack.pp
@@ -1,21 +1,24 @@
+# == Class: user::stack
+#
+
 class user::stack(
   $username = 'stack'
 )
 {
 
-  notify {'after':
+  notify { 'after':
     message => "User params: u => $username, p => $stack_pass, k => $stack_sshkey"
   }
 
 
-  file {'/etc/sudoers.d/stack':
-    owner => "root",
-    group => "root",
-    mode  => 440,
-    source => "puppet:///modules/user/stack_sudoers"
+  file { '/etc/sudoers.d/stack':
+    owner => 'root',
+    group => 'root',
+    mode => '0440',
+    source => 'puppet:///modules/user/stack_sudoers',
   } ->
 
-  user::create {'stack':
+  user::create { 'stack':
     user => $username,
     pass => $stack_pass,
     key => $stack_sshkey,
@@ -25,8 +28,8 @@ class user::stack(
   file {'/home/stack/.bashrc':
     owner => $username,
     group => $username,
-    mode  => 644,
-    source => "puppet:///modules/user/stack_bashrc"
+    mode => '0644',
+    source => 'puppet:///modules/user/stack_bashrc',
   }
 
 }