diff --git a/mem/buffers.go b/mem/buffers.go
index 5144b7c86536..ecbf0b9a73ea 100644
--- a/mem/buffers.go
+++ b/mem/buffers.go
@@ -92,9 +92,10 @@ func newBuffer() *buffer {
 //
 // Note that the backing array of the given data is not copied.
 func NewBuffer(data *[]byte, pool BufferPool) Buffer {
-	// Use the buffer's capacity instead of the length, otherwise buffers may not be reused under certain
-	// conditions. For example, if a large buffer is acquired from the pool, but fewer bytes than the
-	// buffering threshold are written to it, the buffer will not be returned to the pool.
+	// Use the buffer's capacity instead of the length, otherwise buffers may
+	// not be reused under certain conditions. For example, if a large buffer
+	// is acquired from the pool, but fewer bytes than the buffering threshold
+	// are written to it, the buffer will not be returned to the pool.
 	if pool == nil || IsBelowBufferPoolingThreshold(cap(*data)) {
 		return (SliceBuffer)(*data)
 	}
diff --git a/mem/buffers_test.go b/mem/buffers_test.go
index 41f0c9bfacd8..9a98e46e7ab8 100644
--- a/mem/buffers_test.go
+++ b/mem/buffers_test.go
@@ -107,7 +107,7 @@ func (s) TestBuffer_NewBufferHandlesShortBuffers(t *testing.T) {
 		internal.SetBufferPoolingThresholdForTesting.(func(int))(0)
 	})
 
-	// Make a buffer whose capacity is larger than the pooling threshold, but whose length is less than
+	// Make a Buffer whose capacity is larger than the pooling threshold, but whose length is less than
 	// the threshold.
 	b := make([]byte, threshold/2, threshold*2)
 	pool := &singleBufferPool{
@@ -115,12 +115,12 @@ func (s) TestBuffer_NewBufferHandlesShortBuffers(t *testing.T) {
 		data: &b,
 	}
 
-	// Get a buffer, then free it. If NewBuffer decided that the buffer shouldn't get pooled, Free will
+	// Get a Buffer, then free it. If NewBuffer decided that the Buffer shouldn't get pooled, Free will
 	// be a noop and singleBufferPool will not have been updated.
 	mem.NewBuffer(&b, pool).Free()
 
 	if pool.data != nil {
-		t.Fatalf("buffer not returned to pool")
+		t.Fatalf("Buffer not returned to pool")
 	}
 }