diff --git a/clientconn.go b/clientconn.go
index 4c4ecb3d..36bc1e3d 100644
--- a/clientconn.go
+++ b/clientconn.go
@@ -408,11 +408,11 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 		return StreamProtocolUDP
 	}()
 
-	transport := &headers.Transport{
+	th := headers.Transport{
 		Protocol: proto,
 		Delivery: func() *base.StreamDelivery {
-			ret := base.StreamDeliveryUnicast
-			return &ret
+			v := base.StreamDeliveryUnicast
+			return &v
 		}(),
 		Mode: &mode,
 	}
@@ -469,10 +469,10 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 			return nil, err
 		}
 
-		transport.ClientPorts = &[2]int{rtpPort, rtcpPort}
+		th.ClientPorts = &[2]int{rtpPort, rtcpPort}
 
 	} else {
-		transport.InterleavedIds = &[2]int{(track.ID * 2), (track.ID * 2) + 1}
+		th.InterleavedIds = &[2]int{(track.ID * 2), (track.ID * 2) + 1}
 	}
 
 	trackURL, err := track.URL()
@@ -488,7 +488,7 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 		Method: base.Setup,
 		URL:    trackURL,
 		Header: base.Header{
-			"Transport": transport.Write(),
+			"Transport": th.Write(),
 		},
 	})
 	if err != nil {
@@ -519,7 +519,7 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 		return res, fmt.Errorf("bad status code: %d (%s)", res.StatusCode, res.StatusMessage)
 	}
 
-	th, err := headers.ReadTransport(res.Header["Transport"])
+	thRes, err := headers.ReadTransport(res.Header["Transport"])
 	if err != nil {
 		if proto == StreamProtocolUDP {
 			rtpListener.close()
@@ -529,18 +529,18 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 	}
 
 	if proto == StreamProtocolUDP {
-		if th.ServerPorts == nil {
+		if thRes.ServerPorts == nil {
 			rtpListener.close()
 			rtcpListener.close()
 			return nil, fmt.Errorf("server ports not provided")
 		}
 
 	} else {
-		if th.InterleavedIds == nil ||
-			(*th.InterleavedIds)[0] != (*transport.InterleavedIds)[0] ||
-			(*th.InterleavedIds)[1] != (*transport.InterleavedIds)[1] {
+		if thRes.InterleavedIds == nil ||
+			(*thRes.InterleavedIds)[0] != (*th.InterleavedIds)[0] ||
+			(*thRes.InterleavedIds)[1] != (*th.InterleavedIds)[1] {
 			return nil, fmt.Errorf("transport header does not have interleaved ids %v (%s)",
-				*transport.InterleavedIds, res.Header["Transport"])
+				*th.InterleavedIds, res.Header["Transport"])
 		}
 	}
 
@@ -564,14 +564,14 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
 	if proto == StreamProtocolUDP {
 		rtpListener.remoteIP = c.nconn.RemoteAddr().(*net.TCPAddr).IP
 		rtpListener.remoteZone = c.nconn.RemoteAddr().(*net.TCPAddr).Zone
-		rtpListener.remotePort = (*th.ServerPorts)[0]
+		rtpListener.remotePort = (*thRes.ServerPorts)[0]
 		rtpListener.trackID = track.ID
 		rtpListener.streamType = StreamTypeRtp
 		c.udpRtpListeners[track.ID] = rtpListener
 
 		rtcpListener.remoteIP = c.nconn.RemoteAddr().(*net.TCPAddr).IP
 		rtcpListener.remoteZone = c.nconn.RemoteAddr().(*net.TCPAddr).Zone
-		rtcpListener.remotePort = (*th.ServerPorts)[1]
+		rtcpListener.remotePort = (*thRes.ServerPorts)[1]
 		rtcpListener.trackID = track.ID
 		rtcpListener.streamType = StreamTypeRtcp
 		c.udpRtcpListeners[track.ID] = rtcpListener
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 58b9661b..885b07f6 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -99,14 +99,14 @@ func (ac *Client) GenerateHeader(method base.Method, ur *base.URL) base.HeaderVa
 		response := md5Hex(md5Hex(ac.user+":"+ac.realm+":"+ac.pass) + ":" +
 			ac.nonce + ":" + md5Hex(string(method)+":"+urStr))
 
-		return (&headers.Auth{
+		return headers.Auth{
 			Method:   headers.AuthDigest,
 			Username: &ac.user,
 			Realm:    &ac.realm,
 			Nonce:    &ac.nonce,
 			URI:      &urStr,
 			Response: &response,
-		}).Write()
+		}.Write()
 	}
 
 	return nil
diff --git a/pkg/auth/server.go b/pkg/auth/server.go
index 971765d3..8ea9948a 100644
--- a/pkg/auth/server.go
+++ b/pkg/auth/server.go
@@ -53,11 +53,11 @@ func (as *Server) GenerateHeader() base.HeaderValue {
 			}).Write()...)
 
 		case headers.AuthDigest:
-			ret = append(ret, (&headers.Auth{
+			ret = append(ret, headers.Auth{
 				Method: headers.AuthDigest,
 				Realm:  &as.realm,
 				Nonce:  &as.nonce,
-			}).Write()...)
+			}.Write()...)
 		}
 	}
 	return ret
diff --git a/pkg/headers/auth.go b/pkg/headers/auth.go
index 44a45e42..65e2fece 100644
--- a/pkg/headers/auth.go
+++ b/pkg/headers/auth.go
@@ -168,7 +168,7 @@ func ReadAuth(v base.HeaderValue) (*Auth, error) {
 }
 
 // Write encodes an Authenticate or a WWW-Authenticate header.
-func (ha *Auth) Write() base.HeaderValue {
+func (ha Auth) Write() base.HeaderValue {
 	ret := ""
 
 	switch ha.Method {
diff --git a/pkg/headers/session.go b/pkg/headers/session.go
index 9f2d598e..f87d542f 100644
--- a/pkg/headers/session.go
+++ b/pkg/headers/session.go
@@ -63,7 +63,7 @@ func ReadSession(v base.HeaderValue) (*Session, error) {
 }
 
 // Write encodes a Session header
-func (hs *Session) Write() base.HeaderValue {
+func (hs Session) Write() base.HeaderValue {
 	val := hs.Session
 
 	if hs.Timeout != nil {
diff --git a/pkg/headers/transport.go b/pkg/headers/transport.go
index e35e2b58..52186d1b 100644
--- a/pkg/headers/transport.go
+++ b/pkg/headers/transport.go
@@ -201,7 +201,7 @@ func ReadTransport(v base.HeaderValue) (*Transport, error) {
 }
 
 // Write encodes a Transport header
-func (ht *Transport) Write() base.HeaderValue {
+func (ht Transport) Write() base.HeaderValue {
 	var vals []string
 
 	if ht.Protocol == base.StreamProtocolUDP {