diff --git a/examples/client-read-aac/main.go b/examples/client-read-aac/main.go
index 73c114df..04d070a5 100644
--- a/examples/client-read-aac/main.go
+++ b/examples/client-read-aac/main.go
@@ -11,7 +11,7 @@ import (
 
 // This example shows how to
 // 1. connect to a RTSP server and read all tracks on a path
-// 2. check whether there's an AAC track
+// 2. check if there's an AAC track
 // 3. get AAC AUs of that track
 
 func main() {
diff --git a/examples/client-read-h264-convert-to-jpeg/main.go b/examples/client-read-h264-convert-to-jpeg/main.go
index 3eaccc1f..bd435a14 100644
--- a/examples/client-read-h264-convert-to-jpeg/main.go
+++ b/examples/client-read-h264-convert-to-jpeg/main.go
@@ -16,8 +16,8 @@ import (
 
 // This example shows how to
 // 1. connect to a RTSP server and read all tracks on a path
-// 2. check whether there's a H264 track
-// 3. convert H264 NALUs of that track into raw frames
+// 2. check if there's a H264 track
+// 3. convert H264 into raw frames
 // 4. encode the frames into JPEG images and save them on disk
 // This example requires the ffmpeg libraries, that can be installed in this way:
 // apt install -y libavformat-dev libswscale-dev gcc pkg-config
@@ -92,7 +92,7 @@ func main() {
 
 	// send SPS and PPS to the decoder
 	if h264tr.SPS() == nil || h264tr.PPS() == nil {
-		panic("SPS or PPS not provided by the SDP")
+		panic("SPS or PPS not present into the SDP")
 	}
 	h264dec.decode(h264tr.SPS())
 	h264dec.decode(h264tr.PPS())
diff --git a/examples/client-read-h264-save-to-disk/main.go b/examples/client-read-h264-save-to-disk/main.go
index bb9443a4..8ecfbd74 100644
--- a/examples/client-read-h264-save-to-disk/main.go
+++ b/examples/client-read-h264-save-to-disk/main.go
@@ -9,7 +9,7 @@ import (
 
 // This example shows how to
 // 1. connect to a RTSP server and read all tracks on a path
-// 2. check whether there's a H264 track
+// 2. check if there's a H264 track
 // 3. save the content of the H264 track to a file in MPEG-TS format
 
 func main() {
diff --git a/examples/client-read-h264-save-to-disk/mpegtsencoder.go b/examples/client-read-h264-save-to-disk/mpegtsencoder.go
index b020b385..fc0b63c4 100644
--- a/examples/client-read-h264-save-to-disk/mpegtsencoder.go
+++ b/examples/client-read-h264-save-to-disk/mpegtsencoder.go
@@ -67,7 +67,7 @@ func (e *mpegtsEncoder) encode(nalus [][]byte, pts time.Duration) error {
 		e.startPTS = pts
 	}
 
-	// check whether there's an IDR
+	// check if there's an IDR
 	idrPresent := func() bool {
 		for _, nalu := range nalus {
 			typ := h264.NALUType(nalu[0] & 0x1F)
diff --git a/examples/client-read-h264/main.go b/examples/client-read-h264/main.go
index a2c6d085..6bc05fc8 100644
--- a/examples/client-read-h264/main.go
+++ b/examples/client-read-h264/main.go
@@ -11,8 +11,8 @@ import (
 
 // This example shows how to
 // 1. connect to a RTSP server and read all tracks on a path
-// 2. check whether there's an H264 track
-// 3. convert H264 NALUs of that track into raw frames
+// 2. check if there's an H264 track
+// 3. convert H264 into raw frames
 // This example requires the ffmpeg libraries, that can be installed in this way:
 // apt install -y libavformat-dev libswscale-dev gcc pkg-config
 
@@ -69,7 +69,7 @@ func main() {
 
 	// send SPS and PPS to the decoder
 	if h264tr.SPS() == nil || h264tr.PPS() == nil {
-		panic("SPS or PPS not provided by the SDP")
+		panic("SPS or PPS not present into the SDP")
 	}
 	h264dec.decode(h264tr.SPS())
 	h264dec.decode(h264tr.PPS())
diff --git a/serverstream.go b/serverstream.go
index 21201c11..44fd592d 100644
--- a/serverstream.go
+++ b/serverstream.go
@@ -125,7 +125,7 @@ func (st *ServerStream) readerAdd(
 
 	switch transport {
 	case TransportUDP:
-		// check whether client ports are already in use by another reader.
+		// check if client ports are already in use by another reader.
 		for r := range st.readersUnicast {
 			if *r.setuppedTransport == TransportUDP &&
 				r.author.ip().Equal(ss.author.ip()) &&