diff --git a/src/Expr.php b/src/Expr.php
index cf48f86ad..ad73f0844 100644
--- a/src/Expr.php
+++ b/src/Expr.php
@@ -49,7 +49,6 @@ class Expr
      * Constructor
      *
      * @param  string $expression the expression to hold.
-     * @return void
      */
     public function __construct($expression)
     {
diff --git a/src/Server/Error.php b/src/Server/Error.php
index b408279f2..0ccda9827 100644
--- a/src/Server/Error.php
+++ b/src/Server/Error.php
@@ -60,7 +60,6 @@ class Error
      * @param  string $message
      * @param  int $code
      * @param  mixed $data
-     * @return void
      */
     public function __construct($message = null, $code = -32000, $data = null)
     {
diff --git a/src/Server/Request/Http.php b/src/Server/Request/Http.php
index bd6541772..78a053a73 100644
--- a/src/Server/Request/Http.php
+++ b/src/Server/Request/Http.php
@@ -29,7 +29,6 @@ class Http extends JsonRequest
      *
      * Pull JSON request from raw POST body and use to populate request.
      *
-     * @return void
      */
     public function __construct()
     {
diff --git a/src/Server/Response.php b/src/Server/Response.php
index 34bd89494..8365f626e 100644
--- a/src/Server/Response.php
+++ b/src/Server/Response.php
@@ -39,7 +39,7 @@ class Response
 
     /**
      * Service map
-     * @var Smd\Smd
+     * @var Smd
      */
     protected $serviceMap;
 
@@ -248,7 +248,7 @@ public function setArgs($args)
     /**
      * Set service map object
      *
-     * @param  Smd\Smd $serviceMap
+     * @param  Smd $serviceMap
      * @return Response
      */
     public function setServiceMap($serviceMap)
@@ -260,7 +260,7 @@ public function setServiceMap($serviceMap)
     /**
      * Retrieve service map
      *
-     * @return Smd\Smd|null
+     * @return Smd|null
      */
     public function getServiceMap()
     {
diff --git a/src/Server/Smd.php b/src/Server/Smd.php
index ee62a588f..f1b9981bf 100644
--- a/src/Server/Smd.php
+++ b/src/Server/Smd.php
@@ -97,7 +97,7 @@ class Smd
      * Set object state via options
      *
      * @param  array $options
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setOptions(array $options)
     {
@@ -114,7 +114,7 @@ public function setOptions(array $options)
      * Set transport
      *
      * @param  string $transport
-     * @return Zend\Json\Server\Smd
+     * @return \Zend\Json\Server\Smd
      */
     public function setTransport($transport)
     {
@@ -139,7 +139,7 @@ public function getTransport()
      * Set envelope
      *
      * @param  string $envelopeType
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setEnvelope($envelopeType)
     {
@@ -165,7 +165,7 @@ public function getEnvelope()
      * Set content type
      *
      * @param  string $type
-     * @return Zend\Json\Server\Smd
+     * @return \Zend\Json\Server\Smd
      */
     public function setContentType($type)
     {
@@ -190,7 +190,7 @@ public function getContentType()
      * Set service target
      *
      * @param  string $target
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setTarget($target)
     {
@@ -212,7 +212,7 @@ public function getTarget()
      * Set service ID
      *
      * @param  string $Id
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setId($id)
     {
@@ -234,7 +234,7 @@ public function getId()
      * Set service description
      *
      * @param  string $description
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setDescription($description)
     {
@@ -256,7 +256,7 @@ public function getDescription()
      * Indicate whether or not to generate Dojo-compatible SMD
      *
      * @param  bool $flag
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setDojoCompatible($flag)
     {
@@ -277,8 +277,8 @@ public function isDojoCompatible()
     /**
      * Add Service
      *
-     * @param Zend\Json\Server\Smd\Service|array $service
-     * @return void
+     * @param Smd\Service|array $service
+     * @return Smd
      */
     public function addService($service)
     {
@@ -302,7 +302,7 @@ public function addService($service)
      * Add many services
      *
      * @param  array $services
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function addServices(array $services)
     {
@@ -316,7 +316,7 @@ public function addServices(array $services)
      * Overwrite existing services with new ones
      *
      * @param  array $services
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setServices(array $services)
     {
@@ -328,7 +328,7 @@ public function setServices(array $services)
      * Get service object
      *
      * @param  string $name
-     * @return false|Zend\Json\Server\Smd\Service
+     * @return boolean|Smd\Service
      */
     public function getService($name)
     {
diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
index 9552ca97c..010942425 100644
--- a/src/Server/Smd/Service.php
+++ b/src/Server/Smd/Service.php
@@ -107,7 +107,6 @@ class Service
      * Constructor
      *
      * @param  string|array $spec
-     * @return void
      * @throws Zend\Json\Server\Exception\InvalidArgumentException if no name provided
      */
     public function __construct($spec)
@@ -428,9 +427,10 @@ public function __toString()
     /**
      * Validate parameter type
      *
-     * @param  string $type
-     * @return true
-     * @throws Zend\Json\Server\Exception
+     * @param string  $type
+     * @param boolean $isReturn
+     * @return string
+     * @throws InvalidArgumentException
      */
     protected function _validateParamType($type, $isReturn = false)
     {