3 files changed, 6 insertions, 5 deletions
diff --git a/core/dnsserver/server-grpc.go b/core/dnsserver/server-grpc.go
index a91255f28..41fee8c8a 100644
--- a/core/dnsserver/server-grpc.go
+++ b/core/dnsserver/server-grpc.go
@@ -24,7 +24,7 @@ type servergRPC struct {
 	listenAddr net.Addr
 }
 
-// NewGRPCServer returns a new CoreDNS GRPC server and compiles all middleware in to it.
+// NewServergRPC returns a new CoreDNS GRPC server and compiles all middleware in to it.
 func NewServergRPC(addr string, group []*Config) (*servergRPC, error) {
 
 	s, err := NewServer(addr, group)
@@ -144,9 +144,9 @@ func (s *servergRPC) Query(ctx context.Context, in *pb.DnsPacket) (*pb.DnsPacket
 	return &pb.DnsPacket{Msg: packed}, nil
 }
 
-func (g *servergRPC) Shutdown() error {
-	if g.grpcServer != nil {
-		g.grpcServer.Stop()
+func (s *servergRPC) Shutdown() error {
+	if s.grpcServer != nil {
+		s.grpcServer.Stop()
 	}
 	return nil
 }
diff --git a/core/dnsserver/server-tls.go b/core/dnsserver/server-tls.go
index 9d0a81876..8302244c8 100644
--- a/core/dnsserver/server-tls.go
+++ b/core/dnsserver/server-tls.go
@@ -14,7 +14,7 @@ type serverTLS struct {
 	*Server
 }
 
-// NewTLSServer returns a new CoreDNS TLS server and compiles all middleware in to it.
+// NewServerTLS returns a new CoreDNS TLS server and compiles all middleware in to it.
 func NewServerTLS(addr string, group []*Config) (*serverTLS, error) {
 
 	s, err := NewServer(addr, group)
diff --git a/core/dnsserver/server.go b/core/dnsserver/server.go
index 7366c69d1..5bbbf9f9c 100644
--- a/core/dnsserver/server.go
+++ b/core/dnsserver/server.go
@@ -252,6 +252,7 @@ func (s *Server) OnStartupComplete() {
 	}
 }
 
+// Tracer ... TODO: Add comment
 func (s *Server) Tracer() ot.Tracer {
 	if s.trace == nil {
 		return nil