diff --git a/file.c b/file.c
index eee76b9..0c3b2ca 100644
--- a/file.c
+++ b/file.c
@@ -51,12 +51,11 @@ FILE *pathn(char *mode, char *prefix, UT_string *user, UT_string *device, char *
 
 	if (device) {
 		ut_lower(device);
+		utstring_printf(path, "%s/%s/%s/%s", JSONDIR, prefix, utstring_body(user), utstring_body(device));
+	} else {
+		utstring_printf(path, "%s/%s/%s", JSONDIR, prefix, utstring_body(user));
 	}
 
-        //utstring_printf(path, "%s/%s/%-1.1s/%-2.2s",
-        //       JSONDIR, prefix, utstring_body(user), utstring_body(user));
-        utstring_printf(path, "%s/%s/%s/%s", JSONDIR, prefix, utstring_body(user), utstring_body(device));
-
         ut_clean(path);
 
         if (mkpath(utstring_body(path)) < 0) {