diff --git a/_examples/experimental-handlers/csrf/main.go b/_examples/experimental-handlers/csrf/main.go
index e8a8bf00..20964ac0 100644
--- a/_examples/experimental-handlers/csrf/main.go
+++ b/_examples/experimental-handlers/csrf/main.go
@@ -44,7 +44,7 @@ func getSignupForm(ctx iris.Context) {
 	ctx.ViewData(csrf.TemplateTag, csrf.TemplateField(ctx))
 	ctx.View("user/signup.html")
 
-	// We could also retrieve the token directly from csrf.Token(r) and
+	// We could also retrieve the token directly from csrf.Token(ctx) and
 	// set it in the request header - ctx.GetHeader("X-CSRF-Token", token)
 	// This is useful if you're sending JSON to clients or a front-end JavaScript
 	// framework.
diff --git a/context/context.go b/context/context.go
index 05ea0174..541b1f42 100644
--- a/context/context.go
+++ b/context/context.go
@@ -1553,8 +1553,7 @@ func (ctx *context) ContentType(cType string) {
 	// if doesn't contain a charset already then append it
 	if !strings.Contains(cType, "charset") {
 		if cType != ContentBinaryHeaderValue {
-			charset := ctx.Application().ConfigurationReadOnly().GetCharset()
-			cType += "; charset=" + charset
+			cType += "; charset=" + ctx.Application().ConfigurationReadOnly().GetCharset()
 		}
 	}
 
@@ -1940,6 +1939,7 @@ func (ctx *context) UploadFormFiles(destDirectory string, before ...func(Context
 					n += n0
 				}
 			}
+			return n, nil
 		}
 	}