diff --git a/manifests/init.pp b/manifests/init.pp
index d8753b2..4453f1b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,18 +24,17 @@
 
   create_resources(accounts::group, $primary_groups)
 
-  class { 'accounts::users':
+  class { '::accounts::users':
     manage   => $manage_users,
     users    => $merged_users,
     defaults => $user_defaults,
     before   => Anchor['accounts::primary_groups_created'],
   }
 
-  # first create users, then assign users to the groups
-  class { 'accounts::groups':
-    manage  => $manage_groups,
-    users   => $merged_users,
-    groups  => $merged_groups,
-    #require => Class['accounts::users']
+  # each user resource will have dependency on a group, if needed
+  class { '::accounts::groups':
+    manage => $manage_groups,
+    users  => $merged_users,
+    groups => $merged_groups,
   }
 }
diff --git a/manifests/user.pp b/manifests/user.pp
index 5f7adad..7182aef 100644
--- a/manifests/user.pp
+++ b/manifests/user.pp
@@ -56,7 +56,7 @@
     $home_dir = $home
   } else {
     $home_dir = $username ? {
-      root    => '/root',
+      'root'  => '/root',
       default => "/home/${username}",
     }
   }
@@ -71,7 +71,7 @@
   User <| title == $username |> { home => $home_dir }
 
   case $ensure {
-    absent: {
+    'absent': {
       if $managehome == true {
         exec { "rm -rf ${home_dir}":
           path   => [ '/bin', '/usr/bin' ],
@@ -103,12 +103,11 @@
         group { $primary_group:
           ensure  => absent,
           gid     => $real_gid,
-          require => User[$username]
+          require => User[$username],
         }
       }
     }
-
-    present: {
+    'present': {
       # prior to Puppet 3.6 `purge_ssh_keys` is not supported
       if versioncmp($::puppetversion, '3.6.0') < 0 {
         user { $username:
@@ -168,7 +167,7 @@
         }
 
         Ssh_authorized_key {
-          require =>  File[$authorized_keys]
+          require =>  File[$authorized_keys],
         }
       }