diff --git a/util/env.go b/util/env.go
index 5ae8916..915afa8 100644
--- a/util/env.go
+++ b/util/env.go
@@ -13,17 +13,16 @@ import (
 
 // GetEnvInt finds an ENV variable and converts to int, otherwise return default value
 func GetEnvInt(key string, defaultVal int) int {
+	var err error
+	intVal := defaultVal
+
 	if v, ok := os.LookupEnv(key); ok {
-		if i, err := strconv.Atoi(v); err == nil {
-			return i
-		} else {
+		if intVal, err = strconv.Atoi(v); err != nil {
 			log.Fatal(err)
 		}
-
-		return 0
 	}
 
-	return defaultVal
+	return intVal
 }
 
 // GetEnvStr finds an ENV variable, otherwise return default value
diff --git a/util/util.go b/util/util.go
index 623455c..bbc7de8 100644
--- a/util/util.go
+++ b/util/util.go
@@ -38,6 +38,7 @@ func ConnectStorm() *storm.DB {
 	return db
 }
 
+// CreateDirIfNotExist creates a directory if not found
 func CreateDirIfNotExist(dir string) {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0755)