diff --git a/cmd/roaring-migrate/main.go b/cmd/roaring-migrate/main.go
index e12348e56..a20c91290 100644
--- a/cmd/roaring-migrate/main.go
+++ b/cmd/roaring-migrate/main.go
@@ -243,9 +243,8 @@ func copyFile(src, dest string) error {
 }
 
 func Migrate(dataDir, backupPath string) error {
-	if strings.HasSuffix(dataDir, "/") {
-		dataDir = dataDir[:len(dataDir)-1]
-	}
+	dataDir = strings.TrimSuffix(dataDir, "/")
+
 	err := os.MkdirAll(backupPath, 0777)
 	if err != nil {
 		return err
diff --git a/server/config.go b/server/config.go
index 0c1989c7a..fe6de3c69 100644
--- a/server/config.go
+++ b/server/config.go
@@ -625,14 +625,14 @@ func (c *Config) ValidateAuth() ([]error, error) {
 	errors := make([]error, 0)
 	for name, value := range authConfig {
 		if value == "" {
-			errors = append(errors, fmt.Errorf("Empty string for auth config %s", name))
+			errors = append(errors, fmt.Errorf("empty string for auth config %s", name))
 			continue
 		}
 
 		if strings.Contains(name, "URL") {
 			_, err := url.ParseRequestURI(value)
 			if err != nil {
-				errors = append(errors, fmt.Errorf("Invalid URL for auth config %s: %s", name, err))
+				errors = append(errors, fmt.Errorf("invalid URL for auth config %s: %s", name, err))
 				continue
 			}
 		}
diff --git a/server/config_internal_test.go b/server/config_internal_test.go
index 8d5e1fea0..779ef3592 100644
--- a/server/config_internal_test.go
+++ b/server/config_internal_test.go
@@ -292,8 +292,8 @@ func TestConfig_validateAddrsGRPC(t *testing.T) {
 }
 
 func TestConfig_validateAuth(t *testing.T) {
-	errorMesgEmpty := "Empty string"
-	errorMesgURL := "Invalid URL"
+	errorMesgEmpty := "empty string"
+	errorMesgURL := "invalid URL"
 	validTestURL := "https://url.com/"
 	validClientID := "clientid"
 	validClientSecret := "clientSecret"
diff --git a/server/pg_internal_test.go b/server/pg_internal_test.go
index 75024d509..647a1f3ec 100644
--- a/server/pg_internal_test.go
+++ b/server/pg_internal_test.go
@@ -31,16 +31,12 @@ type TestQueryResultWriter struct {
 }
 
 func (t *TestQueryResultWriter) WriteHeader(headers ...pg.ColumnInfo) error {
-	for _, header := range headers {
-		t.Header = append(t.Header, header)
-	}
+	t.Header = append(t.Header, headers...)
 	return nil
 }
 
 func (t *TestQueryResultWriter) WriteRowText(rowTexts ...string) error {
-	for _, rowText := range rowTexts {
-		t.RowText = append(t.RowText, rowText)
-	}
+	t.RowText = append(t.RowText, rowTexts...)
 	return nil
 }
 
diff --git a/server/server.go b/server/server.go
index 943813b07..13f8422e9 100644
--- a/server/server.go
+++ b/server/server.go
@@ -234,7 +234,7 @@ func (m *Command) Start() (err error) {
 		return errors.Wrap(err, "setting resource limits")
 	}
 
-	if m.Config.Auth.Enable == true {
+	if m.Config.Auth.Enable {
 		m.Config.MustValidateAuth()
 	}