diff --git a/command.go b/command.go
index 598ed980..480a5ce1 100644
--- a/command.go
+++ b/command.go
@@ -81,9 +81,9 @@ func cmdFirstKeyPos(cmd Cmder, info *CommandInfo) int {
 	case "eval", "evalsha":
 		if cmd.stringArg(2) != "0" {
 			return 3
-		} else {
-			return 0
 		}
+
+		return 0
 	case "publish":
 		return 1
 	}
diff --git a/internal/proto/reader.go b/internal/proto/reader.go
index cd94329d..e5ae8a03 100644
--- a/internal/proto/reader.go
+++ b/internal/proto/reader.go
@@ -37,25 +37,25 @@ func (r *Reader) Reset(rd io.Reader) {
 	r.src.Reset(rd)
 }
 
-func (p *Reader) PeekBuffered() []byte {
-	if n := p.src.Buffered(); n != 0 {
-		b, _ := p.src.Peek(n)
+func (r *Reader) PeekBuffered() []byte {
+	if n := r.src.Buffered(); n != 0 {
+		b, _ := r.src.Peek(n)
 		return b
 	}
 	return nil
 }
 
-func (p *Reader) ReadN(n int) ([]byte, error) {
-	b, err := readN(p.src, p.buf, n)
+func (r *Reader) ReadN(n int) ([]byte, error) {
+	b, err := readN(r.src, r.buf, n)
 	if err != nil {
 		return nil, err
 	}
-	p.buf = b
+	r.buf = b
 	return b, nil
 }
 
-func (p *Reader) ReadLine() ([]byte, error) {
-	line, isPrefix, err := p.src.ReadLine()
+func (r *Reader) ReadLine() ([]byte, error) {
+	line, isPrefix, err := r.src.ReadLine()
 	if err != nil {
 		return nil, err
 	}
@@ -71,8 +71,8 @@ func (p *Reader) ReadLine() ([]byte, error) {
 	return line, nil
 }
 
-func (p *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
-	line, err := p.ReadLine()
+func (r *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
+	line, err := r.ReadLine()
 	if err != nil {
 		return nil, err
 	}
@@ -85,19 +85,19 @@ func (p *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
 	case IntReply:
 		return parseInt(line[1:], 10, 64)
 	case StringReply:
-		return p.readTmpBytesValue(line)
+		return r.readTmpBytesValue(line)
 	case ArrayReply:
 		n, err := parseArrayLen(line)
 		if err != nil {
 			return nil, err
 		}
-		return m(p, n)
+		return m(r, n)
 	}
 	return nil, fmt.Errorf("redis: can't parse %.100q", line)
 }
 
-func (p *Reader) ReadIntReply() (int64, error) {
-	line, err := p.ReadLine()
+func (r *Reader) ReadIntReply() (int64, error) {
+	line, err := r.ReadLine()
 	if err != nil {
 		return 0, err
 	}
@@ -111,8 +111,8 @@ func (p *Reader) ReadIntReply() (int64, error) {
 	}
 }
 
-func (p *Reader) ReadTmpBytesReply() ([]byte, error) {
-	line, err := p.ReadLine()
+func (r *Reader) ReadTmpBytesReply() ([]byte, error) {
+	line, err := r.ReadLine()
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +120,7 @@ func (p *Reader) ReadTmpBytesReply() ([]byte, error) {
 	case ErrorReply:
 		return nil, ParseErrorReply(line)
 	case StringReply:
-		return p.readTmpBytesValue(line)
+		return r.readTmpBytesValue(line)
 	case StatusReply:
 		return parseStatusValue(line), nil
 	default:
@@ -138,24 +138,24 @@ func (r *Reader) ReadBytesReply() ([]byte, error) {
 	return cp, nil
 }
 
-func (p *Reader) ReadStringReply() (string, error) {
-	b, err := p.ReadTmpBytesReply()
+func (r *Reader) ReadStringReply() (string, error) {
+	b, err := r.ReadTmpBytesReply()
 	if err != nil {
 		return "", err
 	}
 	return string(b), nil
 }
 
-func (p *Reader) ReadFloatReply() (float64, error) {
-	b, err := p.ReadTmpBytesReply()
+func (r *Reader) ReadFloatReply() (float64, error) {
+	b, err := r.ReadTmpBytesReply()
 	if err != nil {
 		return 0, err
 	}
 	return parseFloat(b, 64)
 }
 
-func (p *Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
-	line, err := p.ReadLine()
+func (r *Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
+	line, err := r.ReadLine()
 	if err != nil {
 		return nil, err
 	}
@@ -167,14 +167,14 @@ func (p *Reader) ReadArrayReply(m MultiBulkParse) (interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
-		return m(p, n)
+		return m(r, n)
 	default:
 		return nil, fmt.Errorf("redis: can't parse array reply: %.100q", line)
 	}
 }
 
-func (p *Reader) ReadArrayLen() (int64, error) {
-	line, err := p.ReadLine()
+func (r *Reader) ReadArrayLen() (int64, error) {
+	line, err := r.ReadLine()
 	if err != nil {
 		return 0, err
 	}
@@ -188,8 +188,8 @@ func (p *Reader) ReadArrayLen() (int64, error) {
 	}
 }
 
-func (p *Reader) ReadScanReply() ([]string, uint64, error) {
-	n, err := p.ReadArrayLen()
+func (r *Reader) ReadScanReply() ([]string, uint64, error) {
+	n, err := r.ReadArrayLen()
 	if err != nil {
 		return nil, 0, err
 	}
@@ -197,19 +197,19 @@ func (p *Reader) ReadScanReply() ([]string, uint64, error) {
 		return nil, 0, fmt.Errorf("redis: got %d elements in scan reply, expected 2", n)
 	}
 
-	cursor, err := p.ReadUint()
+	cursor, err := r.ReadUint()
 	if err != nil {
 		return nil, 0, err
 	}
 
-	n, err = p.ReadArrayLen()
+	n, err = r.ReadArrayLen()
 	if err != nil {
 		return nil, 0, err
 	}
 
 	keys := make([]string, n)
 	for i := int64(0); i < n; i++ {
-		key, err := p.ReadStringReply()
+		key, err := r.ReadStringReply()
 		if err != nil {
 			return nil, 0, err
 		}
@@ -219,7 +219,7 @@ func (p *Reader) ReadScanReply() ([]string, uint64, error) {
 	return keys, cursor, err
 }
 
-func (p *Reader) readTmpBytesValue(line []byte) ([]byte, error) {
+func (r *Reader) readTmpBytesValue(line []byte) ([]byte, error) {
 	if isNilReply(line) {
 		return nil, internal.Nil
 	}
@@ -229,7 +229,7 @@ func (p *Reader) readTmpBytesValue(line []byte) ([]byte, error) {
 		return nil, err
 	}
 
-	b, err := p.ReadN(replyLen + 2)
+	b, err := r.ReadN(replyLen + 2)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pubsub.go b/pubsub.go
index 01f8a61a..3ee4ea9d 100644
--- a/pubsub.go
+++ b/pubsub.go
@@ -127,7 +127,7 @@ func (c *PubSub) Close() error {
 	return nil
 }
 
-// Subscribes the client to the specified channels. It returns
+// Subscribe the client to the specified channels. It returns
 // empty subscription if there are no channels.
 func (c *PubSub) Subscribe(channels ...string) error {
 	c.mu.Lock()
@@ -137,7 +137,7 @@ func (c *PubSub) Subscribe(channels ...string) error {
 	return err
 }
 
-// Subscribes the client to the given patterns. It returns
+// PSubscribe the client to the given patterns. It returns
 // empty subscription if there are no patterns.
 func (c *PubSub) PSubscribe(patterns ...string) error {
 	c.mu.Lock()
@@ -147,7 +147,7 @@ func (c *PubSub) PSubscribe(patterns ...string) error {
 	return err
 }
 
-// Unsubscribes the client from the given channels, or from all of
+// Unsubscribe the client from the given channels, or from all of
 // them if none is given.
 func (c *PubSub) Unsubscribe(channels ...string) error {
 	c.mu.Lock()
@@ -157,7 +157,7 @@ func (c *PubSub) Unsubscribe(channels ...string) error {
 	return err
 }
 
-// Unsubscribes the client from the given patterns, or from all of
+// PUnsubscribe the client from the given patterns, or from all of
 // them if none is given.
 func (c *PubSub) PUnsubscribe(patterns ...string) error {
 	c.mu.Lock()
@@ -196,7 +196,7 @@ func (c *PubSub) Ping(payload ...string) error {
 	return err
 }
 
-// Message received after a successful subscription to channel.
+// Subscription received after a successful subscription to channel.
 type Subscription struct {
 	// Can be "subscribe", "unsubscribe", "psubscribe" or "punsubscribe".
 	Kind string
diff --git a/redis.go b/redis.go
index 37ffafd9..ab7beb7c 100644
--- a/redis.go
+++ b/redis.go
@@ -11,7 +11,7 @@ import (
 	"github.com/go-redis/redis/internal/proto"
 )
 
-// Redis nil reply returned when key does not exist.
+// Nil reply redis returned when key does not exist.
 const Nil = internal.Nil
 
 func init() {
@@ -172,9 +172,9 @@ func (c *baseClient) retryBackoff(attempt int) time.Duration {
 func (c *baseClient) cmdTimeout(cmd Cmder) time.Duration {
 	if timeout := cmd.readTimeout(); timeout != nil {
 		return *timeout
-	} else {
-		return c.opt.ReadTimeout
 	}
+
+	return c.opt.ReadTimeout
 }
 
 // Close closes the client, releasing any open resources.
diff --git a/tx.go b/tx.go
index 11d5d5cb..eaea66d3 100644
--- a/tx.go
+++ b/tx.go
@@ -5,7 +5,7 @@ import (
 	"github.com/go-redis/redis/internal/pool"
 )
 
-// Redis transaction failed.
+// TxFailedErr transaction redis failed.
 const TxFailedErr = internal.RedisError("redis: transaction failed")
 
 // Tx implements Redis transactions as described in
@@ -42,7 +42,7 @@ func (c *Client) Watch(fn func(*Tx) error, keys ...string) error {
 	return err
 }
 
-// close closes the transaction, releasing any open resources.
+// Close closes the transaction, releasing any open resources.
 func (c *Tx) Close() error {
 	_ = c.Unwatch().Err()
 	return c.baseClient.Close()