diff --git a/auth.go b/auth.go
index 2503c515..349101be 100644
--- a/auth.go
+++ b/auth.go
@@ -39,7 +39,7 @@ func (a authPairs) searchCredential(authValue string) (string, bool) {
 }
 
 // BasicAuthForRealm returns a Basic HTTP Authorization middleware. It takes as arguments a map[string]string where
-// the key is the user name and the value is the password, as well as the name of the Realm.
+// the key is the username and the value is the password, as well as the name of the Realm.
 // If the realm is empty, "Authorization Required" will be used by default.
 // (see http://tools.ietf.org/html/rfc2617#section-1.2)
 func BasicAuthForRealm(accounts Accounts, realm string) HandlerFunc {
@@ -65,7 +65,7 @@ func BasicAuthForRealm(accounts Accounts, realm string) HandlerFunc {
 }
 
 // BasicAuth returns a Basic HTTP Authorization middleware. It takes as argument a map[string]string where
-// the key is the user name and the value is the password.
+// the key is the username and the value is the password.
 func BasicAuth(accounts Accounts) HandlerFunc {
 	return BasicAuthForRealm(accounts, "")
 }
diff --git a/errors_test.go b/errors_test.go
index 78d561c6..aae22fc5 100644
--- a/errors_test.go
+++ b/errors_test.go
@@ -35,7 +35,7 @@ func TestError(t *testing.T) {
 	jsonBytes, _ := json.Marshal(err)
 	assert.Equal(t, "{\"error\":\"test error\",\"meta\":\"some data\"}", string(jsonBytes))
 
-	err.SetMeta(H{ // nolint: errcheck
+	err.SetMeta(H{ // nolint: err check
 		"status": "200",
 		"data":   "some data",
 	})
diff --git a/tree.go b/tree.go
index 956bf4dd..9e403f58 100644
--- a/tree.go
+++ b/tree.go
@@ -813,7 +813,7 @@ walk: // Outer loop for walking the tree
 				end++
 			}
 
-			// Add param value to case insensitive path
+			// Add param value to case-insensitive path
 			ciPath = append(ciPath, path[:end]...)
 
 			// We need to go deeper!