diff --git a/core/trace/constants.go b/core/trace/constants.go
index 03a9ca67..332988d9 100644
--- a/core/trace/constants.go
+++ b/core/trace/constants.go
@@ -2,5 +2,6 @@ package trace
 
 const (
 	TraceIdKey = "X-Trace-ID"
-	spanIdKey  = "X-Span-ID"
+
+	spanIdKey = "X-Span-ID"
 )
diff --git a/rest/handler/tracinghandler.go b/rest/handler/tracinghandler.go
index 7e250d2b..73dbe531 100644
--- a/rest/handler/tracinghandler.go
+++ b/rest/handler/tracinghandler.go
@@ -21,7 +21,7 @@ func TracingHandler(next http.Handler) http.Handler {
 		defer span.Finish()
 		r = r.WithContext(ctx)
 
-		// Conveniently track error messages
+		// conveniently tracking error messages
 		w.Header().Set(trace.TraceIdKey, span.TraceId())
 		next.ServeHTTP(w, r)
 	})
diff --git a/rest/handler/tracinghandler_test.go b/rest/handler/tracinghandler_test.go
index 69fc0da4..0d5e0fbd 100644
--- a/rest/handler/tracinghandler_test.go
+++ b/rest/handler/tracinghandler_test.go
@@ -1,13 +1,13 @@
 package handler
 
 import (
-	"github.com/tal-tech/go-zero/core/stringx"
-	"github.com/tal-tech/go-zero/core/trace"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/tal-tech/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/trace"
 	"github.com/tal-tech/go-zero/core/trace/tracespec"
 )
 
diff --git a/tools/goctl/rpc/generator/gencall.go b/tools/goctl/rpc/generator/gencall.go
index c145b829..58489fc2 100644
--- a/tools/goctl/rpc/generator/gencall.go
+++ b/tools/goctl/rpc/generator/gencall.go
@@ -109,7 +109,8 @@ func (g *DefaultGenerator) GenCall(ctx DirContext, proto parser.Proto, cfg *conf
 }
 
 func getMessageName(msg proto.Message) string {
-	var list = []string{msg.Name}
+	list := []string{msg.Name}
+
 	for {
 		parent := msg.Parent
 		if parent == nil {
@@ -125,11 +126,13 @@ func getMessageName(msg proto.Message) string {
 		list = append(tmp, list...)
 		msg = *parentMsg
 	}
+
 	return strings.Join(list, "_")
 }
 
 func (g *DefaultGenerator) genFunction(goPackage string, service parser.Service) ([]string, error) {
 	functions := make([]string, 0)
+
 	for _, rpc := range service.RPC {
 		text, err := util.LoadTemplate(category, callFunctionTemplateFile, callFunctionTemplate)
 		if err != nil {
@@ -157,6 +160,7 @@ func (g *DefaultGenerator) genFunction(goPackage string, service parser.Service)
 
 		functions = append(functions, buffer.String())
 	}
+
 	return functions, nil
 }