diff --git a/.gitignore b/.gitignore
index 7d2cb50..1e3a9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-files/
\ No newline at end of file
+files/
+dbfile.db
+hardfile
diff --git a/main.go b/main.go
index 0b7639f..65a9b63 100644
--- a/main.go
+++ b/main.go
@@ -124,9 +124,6 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
 	var expiryTime int64
 	var fileNameLength int
 
-	fileNameLength = 0
-	expiryTime = 0
-
 	file, _, err := r.FormFile("file")
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
@@ -153,10 +150,7 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 		}
-	}
-
-	// Default to conf if not present
-	if expiryTime == 0 {
+	} else {
 		expiryTime = int64(conf.FileExpirySeconds)
 	}
 
@@ -172,10 +166,7 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 		}
-	}
-
-	// Default to conf if not present
-	if fileNameLength == 0 {
+	} else {
 		fileNameLength = conf.FileLen
 	}