diff --git a/salt/states/gbt.sls b/salt/states/gbt.sls
index 70dbbf9..c90a9fa 100644
--- a/salt/states/gbt.sls
+++ b/salt/states/gbt.sls
@@ -3,16 +3,16 @@
 
 Make sure go directory exists:
   file.directory:
-    - name: {{ salt['user.info']( pillar['user']['username']).home }}/go
-    - user: {{ pillar['user']['username'] }}
+    - name: {{ salt['user.info']( pillar['username']).home }}/go
+    - user: {{ pillar['username'] }}
     - group: users
     - mode: "0755"
 
-{% if not salt['file.directory_exists']('{}/go/src/github.com/jtyr/gbt'.format(salt['user.info']( pillar['user']['username']).home)) %}
+{% if not salt['file.directory_exists']('{}/go/src/github.com/jtyr/gbt'.format(salt['user.info']( pillar'username']).home)) %}
 Go get GBT:
   cmd.run:
     - name: go get github.com/jtyr/gbt/cmd/gbt
-    - runas: {{ pillar['user']['username'] }}
+    - runas: {{ pillar['username'] }}
     - env:
-      - GOPATH: {{ salt['user.info']( pillar['user']['username']).home }}/go
+      - GOPATH: {{ salt['user.info']( pillar['username']).home }}/go
 {% endif %}