diff --git a/client.go b/client.go
index 59c6ed79..ca63fa61 100644
--- a/client.go
+++ b/client.go
@@ -38,7 +38,15 @@ func DialPublish(address string, tracks Tracks) (*ClientConn, error) {
 // Client is a RTSP client.
 type Client struct {
 	//
-	// connection
+	// callbacks
+	//
+	// callback called before every request.
+	OnRequest func(*base.Request)
+	// callback called after every response.
+	OnResponse func(*base.Response)
+
+	//
+	// RTSP parameters
 	//
 	// timeout of read operations.
 	// It defaults to 10 seconds.
@@ -49,10 +57,6 @@ type Client struct {
 	// a TLS configuration to connect to TLS (RTSPS) servers.
 	// It defaults to &tls.Config{InsecureSkipVerify:true}
 	TLSConfig *tls.Config
-
-	//
-	// initialization
-	//
 	// disable being redirected to other servers, that can happen during Describe().
 	// It defaults to false.
 	RedirectDisable bool
@@ -60,10 +64,6 @@ type Client struct {
 	// this can be a security issue.
 	// It defaults to false.
 	AnyPortEnable bool
-
-	//
-	// reading / writing
-	//
 	// the stream transport (UDP, Multicast or TCP).
 	// If nil, it is chosen automatically (first UDP, then, if it fails, TCP).
 	// It defaults to nil.
@@ -82,14 +82,6 @@ type Client struct {
 	// It defaults to 2048.
 	ReadBufferSize int
 
-	//
-	// callbacks
-	//
-	// callback called before every request.
-	OnRequest func(req *base.Request)
-	// callback called after every response.
-	OnResponse func(res *base.Response)
-
 	//
 	// system functions
 	//
diff --git a/clientconn.go b/clientconn.go
index d451a3b5..7609e172 100644
--- a/clientconn.go
+++ b/clientconn.go
@@ -167,7 +167,7 @@ type ClientConn struct {
 }
 
 func newClientConn(c *Client, scheme string, host string) (*ClientConn, error) {
-	// connection
+	// RTSP parameters
 	if c.ReadTimeout == 0 {
 		c.ReadTimeout = 10 * time.Second
 	}
@@ -177,12 +177,9 @@ func newClientConn(c *Client, scheme string, host string) (*ClientConn, error) {
 	if c.TLSConfig == nil {
 		c.TLSConfig = &tls.Config{InsecureSkipVerify: true}
 	}
-
-	// reading / writing
 	if c.InitialUDPReadTimeout == 0 {
 		c.InitialUDPReadTimeout = 3 * time.Second
 	}
-
 	if c.ReadBufferCount == 0 {
 		c.ReadBufferCount = 1
 	}