diff --git a/README.md b/README.md
index d7da7cb8..a76be2df 100644
--- a/README.md
+++ b/README.md
@@ -276,8 +276,8 @@ func main() {
 		file, _ := c.FormFile("file")
 		log.Println(file.Filename)
         
-        // Upload the file to specific dst.
-        // c.SaveUploadedFile(file, dst)       
+		// Upload the file to specific dst.
+		// c.SaveUploadedFile(file, dst)       
 		
 		c.String(http.StatusOK, fmt.Sprintf("'%s' uploaded!", file.Filename))
 	})
@@ -309,7 +309,7 @@ func main() {
 			log.Println(file.Filename)
 			
 			// Upload the file to specific dst.
-            // c.SaveUploadedFile(file, dst)       
+			// c.SaveUploadedFile(file, dst)       
 		}
 		c.String(http.StatusOK, fmt.Sprintf("%d files uploaded!", len(files)))
 	})
diff --git a/auth.go b/auth.go
index 7ebf5576..75a7c892 100644
--- a/auth.go
+++ b/auth.go
@@ -52,11 +52,13 @@ func BasicAuthForRealm(accounts Accounts, realm string) HandlerFunc {
 			// Credentials doesn't match, we return 401 and abort handlers chain.
 			c.Header("WWW-Authenticate", realm)
 			c.AbortWithStatus(401)
-		} else {
-			// The user credentials was found, set user's id to key AuthUserKey in this context, the userId can be read later using
-			// c.MustGet(gin.AuthUserKey)
-			c.Set(AuthUserKey, user)
+			return
 		}
+
+		// The user credentials was found, set user's id to key AuthUserKey in this context, the user's id can be read later using
+		// c.MustGet(gin.AuthUserKey)
+		c.Set(AuthUserKey, user)
+		return
 	}
 }
 
diff --git a/context.go b/context.go
index 311da642..87aa1bea 100644
--- a/context.go
+++ b/context.go
@@ -358,8 +358,7 @@ func (c *Context) QueryArray(key string) []string {
 // GetQueryArray returns a slice of strings for a given query key, plus
 // a boolean value whether at least one value exists for the given key.
 func (c *Context) GetQueryArray(key string) ([]string, bool) {
-	req := c.Request
-	if values, ok := req.URL.Query()[key]; ok && len(values) > 0 {
+	if values, ok := c.Request.URL.Query()[key]; ok && len(values) > 0 {
 		return values, true
 	}
 	return []string{}, false
diff --git a/gin.go b/gin.go
index 8388ac7b..fc9214dc 100644
--- a/gin.go
+++ b/gin.go
@@ -156,19 +156,21 @@ func (engine *Engine) LoadHTMLGlob(pattern string) {
 	if IsDebugging() {
 		debugPrintLoadTemplate(template.Must(template.New("").Delims(engine.delims.Left, engine.delims.Right).Funcs(engine.FuncMap).ParseGlob(pattern)))
 		engine.HTMLRender = render.HTMLDebug{Glob: pattern, FuncMap: engine.FuncMap, Delims: engine.delims}
-	} else {
-		templ := template.Must(template.New("").Delims(engine.delims.Left, engine.delims.Right).Funcs(engine.FuncMap).ParseGlob(pattern))
-		engine.SetHTMLTemplate(templ)
+		return
 	}
+	templ := template.Must(template.New("").Delims(engine.delims.Left, engine.delims.Right).Funcs(engine.FuncMap).ParseGlob(pattern))
+	engine.SetHTMLTemplate(templ)
+	return
 }
 
 func (engine *Engine) LoadHTMLFiles(files ...string) {
 	if IsDebugging() {
 		engine.HTMLRender = render.HTMLDebug{Files: files, FuncMap: engine.FuncMap, Delims: engine.delims}
-	} else {
-		templ := template.Must(template.New("").Delims(engine.delims.Left, engine.delims.Right).Funcs(engine.FuncMap).ParseFiles(files...))
-		engine.SetHTMLTemplate(templ)
+		return
 	}
+	templ := template.Must(template.New("").Delims(engine.delims.Left, engine.delims.Right).Funcs(engine.FuncMap).ParseFiles(files...))
+	engine.SetHTMLTemplate(templ)
+	return
 }
 
 func (engine *Engine) SetHTMLTemplate(templ *template.Template) {