diff --git a/clientconn.go b/clientconn.go
index 6b78a768..1c6f8a14 100644
--- a/clientconn.go
+++ b/clientconn.go
@@ -66,9 +66,9 @@ type dialOptions struct {
 type DialOption func(*dialOptions)
 
 // WithCodec returns a DialOption which sets a codec for message marshaling and unmarshaling.
-func WithCodec(codec Codec) DialOption {
+func WithCodec(c Codec) DialOption {
 	return func(o *dialOptions) {
-		o.codec = codec
+		o.codec = c
 	}
 }
 
@@ -110,7 +110,7 @@ func Dial(target string, opts ...DialOption) (*ClientConn, error) {
 	}
 	if cc.dopts.codec == nil {
 		// Set the default codec.
-		cc.dopts.codec = &protoCodec{}
+		cc.dopts.codec = protoCodec{}
 	}
 	if err := cc.resetTransport(false); err != nil {
 		return nil, err
diff --git a/server.go b/server.go
index b70dbe8c..1cdf1555 100644
--- a/server.go
+++ b/server.go
@@ -115,7 +115,7 @@ func NewServer(opt ...ServerOption) *Server {
 	}
 	if opts.codec == nil {
 		// Set the default codec.
-		opts.codec = &protoCodec{}
+		opts.codec = protoCodec{}
 	}
 	return &Server{
 		lis:   make(map[net.Listener]bool),