diff --git a/lib/Predis/Protocol/ProtocolProcessorInterface.php b/lib/Predis/Protocol/ProtocolProcessorInterface.php
index 90230f2e..a69fd73c 100644
--- a/lib/Predis/Protocol/ProtocolProcessorInterface.php
+++ b/lib/Predis/Protocol/ProtocolProcessorInterface.php
@@ -31,7 +31,7 @@ interface ProtocolProcessorInterface
     public function write(ComposableConnectionInterface $connection, CommandInterface $command);
 
     /**
-     * Reads a response from the specified connection and deserializes it.
+     * Reads a response from the specified connection.
      *
      * @param ComposableConnectionInterface $connection Connection to Redis.
      * @return mixed
diff --git a/lib/Predis/Protocol/ResponseReaderInterface.php b/lib/Predis/Protocol/ResponseReaderInterface.php
index bb2f84bf..9565e4f3 100644
--- a/lib/Predis/Protocol/ResponseReaderInterface.php
+++ b/lib/Predis/Protocol/ResponseReaderInterface.php
@@ -22,7 +22,7 @@ use Predis\Connection\ComposableConnectionInterface;
 interface ResponseReaderInterface
 {
     /**
-     * Reads responses from the connection.
+     * Reads a response from the connection.
      *
      * @param ComposableConnectionInterface $connection Connection to Redis.
      * @return mixed
diff --git a/lib/Predis/Protocol/Text/Handler/BulkResponse.php b/lib/Predis/Protocol/Text/Handler/BulkResponse.php
index 6de4d61a..b0daec1c 100644
--- a/lib/Predis/Protocol/Text/Handler/BulkResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/BulkResponse.php
@@ -16,7 +16,7 @@ use Predis\Connection\ComposableConnectionInterface;
 use Predis\Protocol\ProtocolException;
 
 /**
- * Handler for the bulk response type of the standard Redis wire protocol.
+ * Handler for the bulk response type in the standard Redis wire protocol.
  * It translates the payload to a string or a NULL.
  *
  * @link http://redis.io/topics/protocol
diff --git a/lib/Predis/Protocol/Text/Handler/ErrorResponse.php b/lib/Predis/Protocol/Text/Handler/ErrorResponse.php
index f718be89..c7ec336b 100644
--- a/lib/Predis/Protocol/Text/Handler/ErrorResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/ErrorResponse.php
@@ -15,12 +15,9 @@ use Predis\ResponseError;
 use Predis\Connection\ComposableConnectionInterface;
 
 /**
- * Handler for the error response type of the standard Redis wire protocol.
+ * Handler for the error response type in the standard Redis wire protocol.
  * It translates the payload to a complex response object for Predis.
  *
- * This handler returns a reply object to notify the user that an error has
- * occurred on the server.
- *
  * @link http://redis.io/topics/protocol
  * @author Daniele Alessandri <suppakilla@gmail.com>
  */
diff --git a/lib/Predis/Protocol/Text/Handler/IntegerResponse.php b/lib/Predis/Protocol/Text/Handler/IntegerResponse.php
index da72dac5..e06e155c 100644
--- a/lib/Predis/Protocol/Text/Handler/IntegerResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/IntegerResponse.php
@@ -16,7 +16,7 @@ use Predis\Connection\ComposableConnectionInterface;
 use Predis\Protocol\ProtocolException;
 
 /**
- * Handler for the integer response type of the standard Redis wire protocol.
+ * Handler for the integer response type in the standard Redis wire protocol.
  * It translates the payload an integer or NULL.
  *
  * @link http://redis.io/topics/protocol
diff --git a/lib/Predis/Protocol/Text/Handler/MultiBulkResponse.php b/lib/Predis/Protocol/Text/Handler/MultiBulkResponse.php
index 0ed20ae6..54bb1b18 100644
--- a/lib/Predis/Protocol/Text/Handler/MultiBulkResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/MultiBulkResponse.php
@@ -16,7 +16,7 @@ use Predis\Connection\ComposableConnectionInterface;
 use Predis\Protocol\ProtocolException;
 
 /**
- * Handler for the multibulk response type of the standard Redis wire protocol.
+ * Handler for the multibulk response type in the standard Redis wire protocol.
  * It returns multibulk responses as PHP arrays.
  *
  * @link http://redis.io/topics/protocol
diff --git a/lib/Predis/Protocol/Text/Handler/StatusResponse.php b/lib/Predis/Protocol/Text/Handler/StatusResponse.php
index b48f0334..54d82a21 100644
--- a/lib/Predis/Protocol/Text/Handler/StatusResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/StatusResponse.php
@@ -15,7 +15,7 @@ use Predis\ResponseQueued;
 use Predis\Connection\ComposableConnectionInterface;
 
 /**
- * Handler for the status response type of the standard Redis wire protocol.
+ * Handler for the status response type in the standard Redis wire protocol.
  * It translates certain classes of status response to PHP objects or just
  * returns the payload as a string.
  *
diff --git a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
index 362a573d..be59f756 100644
--- a/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
+++ b/lib/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
@@ -17,7 +17,7 @@ use Predis\Iterator\MultiBulkResponseSimple;
 use Predis\Protocol\ProtocolException;
 
 /**
- * Handler for the multibulk response type of the standard Redis wire protocol.
+ * Handler for the multibulk response type in the standard Redis wire protocol.
  * It returns multibulk responses as iterators that can stream bulk elements.
  *
  * Please note that streamable multibulk replies are not globally supported
diff --git a/lib/Predis/Protocol/Text/ResponseReader.php b/lib/Predis/Protocol/Text/ResponseReader.php
index 51143cdc..ab490adc 100644
--- a/lib/Predis/Protocol/Text/ResponseReader.php
+++ b/lib/Predis/Protocol/Text/ResponseReader.php
@@ -51,8 +51,7 @@ class ResponseReader implements ResponseReaderInterface
     }
 
     /**
-     * Sets a response handler for a certain prefix that identifies a type of
-     * response that can be returned by Redis.
+     * Sets the handler for the specified prefix identifying the response type.
      *
      * @param string $prefix Identifier of the type of response.
      * @param Handler\ResponseHandlerInterface $handler Response handler.