diff --git a/src/Clue/Redis/Protocol/Model/BulkReply.php b/src/Clue/Redis/Protocol/Model/BulkReply.php
index e069fda..4ff075c 100644
--- a/src/Clue/Redis/Protocol/Model/BulkReply.php
+++ b/src/Clue/Redis/Protocol/Model/BulkReply.php
@@ -2,7 +2,6 @@
 
 namespace Clue\Redis\Protocol\Model;
 
-use Clue\Redis\Protocol\Model\ModelInterface;
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
 
 class BulkReply implements ModelInterface
diff --git a/src/Clue/Redis/Protocol/Model/ErrorReply.php b/src/Clue/Redis/Protocol/Model/ErrorReply.php
index 556e93b..e8e5cae 100644
--- a/src/Clue/Redis/Protocol/Model/ErrorReply.php
+++ b/src/Clue/Redis/Protocol/Model/ErrorReply.php
@@ -2,8 +2,8 @@
 
 namespace Clue\Redis\Protocol\Model;
 
-use Exception;
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
+use Exception;
 
 /**
  *
@@ -14,7 +14,7 @@ class ErrorReply extends Exception implements ModelInterface
     /**
      * create error status reply (single line error message)
      *
-     * @param string|ErrorReplyException $message
+     * @param string $message
      * @return string
      */
     public function __construct($message, $code = 0, $previous = null)
diff --git a/src/Clue/Redis/Protocol/Model/IntegerReply.php b/src/Clue/Redis/Protocol/Model/IntegerReply.php
index ba1ff05..1c32ed8 100644
--- a/src/Clue/Redis/Protocol/Model/IntegerReply.php
+++ b/src/Clue/Redis/Protocol/Model/IntegerReply.php
@@ -2,7 +2,6 @@
 
 namespace Clue\Redis\Protocol\Model;
 
-use Clue\Redis\Protocol\Model\ModelInterface;
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
 
 class IntegerReply implements ModelInterface
diff --git a/src/Clue/Redis/Protocol/Model/MultiBulkReply.php b/src/Clue/Redis/Protocol/Model/MultiBulkReply.php
index 0ec4ed6..dc6ab47 100644
--- a/src/Clue/Redis/Protocol/Model/MultiBulkReply.php
+++ b/src/Clue/Redis/Protocol/Model/MultiBulkReply.php
@@ -2,9 +2,9 @@
 
 namespace Clue\Redis\Protocol\Model;
 
+use Clue\Redis\Protocol\Serializer\SerializerInterface;
 use InvalidArgumentException;
 use UnexpectedValueException;
-use Clue\Redis\Protocol\Serializer\SerializerInterface;
 
 class MultiBulkReply implements ModelInterface
 {
diff --git a/src/Clue/Redis/Protocol/Model/Request.php b/src/Clue/Redis/Protocol/Model/Request.php
index f5881e9..59a1f8a 100644
--- a/src/Clue/Redis/Protocol/Model/Request.php
+++ b/src/Clue/Redis/Protocol/Model/Request.php
@@ -2,9 +2,6 @@
 
 namespace Clue\Redis\Protocol\Model;
 
-use Clue\Redis\Protocol\Model\ModelInterface;
-use Clue\Redis\Protocol\Model\BulkReply;
-use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
 
 class Request implements ModelInterface
diff --git a/src/Clue/Redis/Protocol/Model/StatusReply.php b/src/Clue/Redis/Protocol/Model/StatusReply.php
index 4ea2fcd..aadc394 100644
--- a/src/Clue/Redis/Protocol/Model/StatusReply.php
+++ b/src/Clue/Redis/Protocol/Model/StatusReply.php
@@ -14,7 +14,7 @@ class StatusReply implements ModelInterface
     /**
      * create status reply (single line message)
      *
-     * @param string|Status $message
+     * @param string $message
      * @return string
      */
     public function __construct($message)
diff --git a/src/Clue/Redis/Protocol/Parser/ParserInterface.php b/src/Clue/Redis/Protocol/Parser/ParserInterface.php
index a322719..f286ad1 100644
--- a/src/Clue/Redis/Protocol/Parser/ParserInterface.php
+++ b/src/Clue/Redis/Protocol/Parser/ParserInterface.php
@@ -2,9 +2,6 @@
 
 namespace Clue\Redis\Protocol\Parser;
 
-use Clue\Redis\Protocol\Model\ModelInterface;
-use Clue\Redis\Protocol\Parser\ParserException;
-
 interface ParserInterface
 {
     /**
@@ -20,8 +17,8 @@ interface ParserInterface
      * message model will be returned once the parser has sufficient data.
      *
      * @param string $dataChunk
-     * @return ModelInterface[] 0+ message models
-     * @throws ParserException if the message can not be parsed
+     * @return \Clue\Redis\Protocol\Model\ModelInterface[] 0+ message models
+     * @throws \Clue\Redis\Protocol\Parser\ParserException if the message can not be parsed
      * @see self::popIncomingModel()
      */
     public function pushIncoming($dataChunk);
diff --git a/src/Clue/Redis/Protocol/Parser/RequestParser.php b/src/Clue/Redis/Protocol/Parser/RequestParser.php
index a47d137..e767bed 100644
--- a/src/Clue/Redis/Protocol/Parser/RequestParser.php
+++ b/src/Clue/Redis/Protocol/Parser/RequestParser.php
@@ -2,7 +2,6 @@
 
 namespace Clue\Redis\Protocol\Parser;
 
-use Clue\Redis\Protocol\Parser\ParserException;
 use Clue\Redis\Protocol\Model\Request;
 
 class RequestParser implements ParserInterface
diff --git a/src/Clue/Redis/Protocol/Parser/ResponseParser.php b/src/Clue/Redis/Protocol/Parser/ResponseParser.php
index ce853b6..4ad13e2 100644
--- a/src/Clue/Redis/Protocol/Parser/ResponseParser.php
+++ b/src/Clue/Redis/Protocol/Parser/ResponseParser.php
@@ -2,14 +2,12 @@
 
 namespace Clue\Redis\Protocol\Parser;
 
-use Clue\Redis\Protocol\Parser\ParserInterface;
 use Clue\Redis\Protocol\Model\ModelInterface;
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\ErrorReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
 use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Model\StatusReply;
-use Clue\Redis\Protocol\Parser\ParserException;
 
 /**
  * Simple recursive redis wire protocol parser
diff --git a/src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php b/src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php
index 6e25125..d75514c 100644
--- a/src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php
+++ b/src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php
@@ -2,14 +2,13 @@
 
 namespace Clue\Redis\Protocol\Serializer;
 
-use Clue\Redis\Protocol\Model\StatusReply;
 use InvalidArgumentException;
 use Exception;
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
 use Clue\Redis\Protocol\Model\ErrorReply;
-use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Model\ModelInterface;
+use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Model\Request;
 
 class RecursiveSerializer implements SerializerInterface
diff --git a/src/Clue/Redis/Protocol/Serializer/SerializerInterface.php b/src/Clue/Redis/Protocol/Serializer/SerializerInterface.php
index bb7cb3e..e6a0762 100644
--- a/src/Clue/Redis/Protocol/Serializer/SerializerInterface.php
+++ b/src/Clue/Redis/Protocol/Serializer/SerializerInterface.php
@@ -2,7 +2,6 @@
 
 namespace Clue\Redis\Protocol\Serializer;
 
-use Clue\Redis\Protocol\Model\ErrorReplyException;
 use Clue\Redis\Protocol\Model\ModelInterface;
 use Clue\Redis\Protocol\Model\MultiBulkReply;
 
diff --git a/tests/Model/MultiBulkReplyTest.php b/tests/Model/MultiBulkReplyTest.php
index 2c36bc8..f5fe962 100644
--- a/tests/Model/MultiBulkReplyTest.php
+++ b/tests/Model/MultiBulkReplyTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Clue\Redis\Protocol\Model\MultiBulkReply;
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
+use Clue\Redis\Protocol\Model\MultiBulkReply;
 
 class MultiBulkReplyTest extends AbstractModelTest
 {
diff --git a/tests/Parser/AbstractParserTest.php b/tests/Parser/AbstractParserTest.php
index 24c737c..4717880 100644
--- a/tests/Parser/AbstractParserTest.php
+++ b/tests/Parser/AbstractParserTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Clue\Redis\Protocol\Parser\ParserInterface;
 use Clue\Redis\Protocol\Parser\MessageBuffer;
+use Clue\Redis\Protocol\Parser\ParserInterface;
 
 abstract class AbstractParserTest extends TestCase
 {
@@ -25,7 +25,7 @@ public function setUpParser()
     public function testParsingMessageOne()
     {
         // getRequestMessage('test')
-        $message = $expected = "*1\r\n$4\r\ntest\r\n";
+        $message = "*1\r\n$4\r\ntest\r\n";
 
         $models = $this->parser->pushIncoming($message);
         $this->assertCount(1, $models);
diff --git a/tests/Parser/RequestParserTest.php b/tests/Parser/RequestParserTest.php
index bc95256..668124e 100644
--- a/tests/Parser/RequestParserTest.php
+++ b/tests/Parser/RequestParserTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Clue\Redis\Protocol\Model\Request;
 use Clue\Redis\Protocol\Parser\RequestParser;
 
 class RequestParserTest extends AbstractParserTest
@@ -29,7 +30,7 @@ public function testSimplePingRequest()
      * @param Request $expected
      * @depends testSimplePingRequest
      */
-    public function testInlinePingRequest($expected)
+    public function testInlinePingRequest(Request $expected)
     {
         $message = "ping\r\n";
 
@@ -58,7 +59,7 @@ public function testIncompleteSuccessive()
         $this->assertEquals(array(), $this->parser->pushIncoming("*1\r\n"));
         $this->assertEquals(array(), $this->parser->pushIncoming("$4\r\n"));
         $this->assertEquals(array(), $this->parser->pushIncoming("test"));
-        $this->assertCount(1, $models = $this->parser->pushIncoming("\r\n"));
+        $this->assertCount(1, $this->parser->pushIncoming("\r\n"));
     }
 
     public function testNullMultiBulkRequestIsIgnored()
@@ -86,7 +87,7 @@ public function testInlineParsesMultipleRequestsAtOnce()
     {
         $message = "hello\r\n\world\r\ntest\r\n";
 
-        $this->assertCount(3, $models = $this->parser->pushIncoming($message));
+        $this->assertCount(3, $this->parser->pushIncoming($message));
     }