diff --git a/api/errors/errors.go b/api/errors/errors.go
index 29fd2545dc..39d52e1a07 100644
--- a/api/errors/errors.go
+++ b/api/errors/errors.go
@@ -16,7 +16,7 @@ func (e apiError) HTTPErrorStatusCode() int {
 
 // NewErrorWithStatusCode allows you to associate
 // a specific HTTP Status Code to an error.
-// The Server will take that code and set
+// The server will take that code and set
 // it as the response status.
 func NewErrorWithStatusCode(err error, code int) error {
 	return apiError{err, code}
diff --git a/api/server/httputils/errors.go b/api/server/httputils/errors.go
index 59098a9df0..c8f24cad28 100644
--- a/api/server/httputils/errors.go
+++ b/api/server/httputils/errors.go
@@ -28,7 +28,7 @@ type inputValidationError interface {
 	IsValidationError() bool
 }
 
-// GetHTTPErrorStatusCode retrieves status code from error message
+// GetHTTPErrorStatusCode retrieves status code from error message.
 func GetHTTPErrorStatusCode(err error) int {
 	if err == nil {
 		logrus.WithFields(logrus.Fields{"error": err}).Error("unexpected HTTP error handling")
diff --git a/api/server/httputils/form.go b/api/server/httputils/form.go
index 69b5bc3f77..78bd379c7a 100644
--- a/api/server/httputils/form.go
+++ b/api/server/httputils/form.go
@@ -15,7 +15,7 @@ func BoolValue(r *http.Request, k string) bool {
 }
 
 // BoolValueOrDefault returns the default bool passed if the query param is
-// missing, otherwise it's just a proxy to boolValue above
+// missing, otherwise it's just a proxy to boolValue above.
 func BoolValueOrDefault(r *http.Request, k string, d bool) bool {
 	if _, ok := r.Form[k]; !ok {
 		return d