diff --git a/src/Decoder.php b/src/Decoder.php
index a3db1b848..fe048a18a 100644
--- a/src/Decoder.php
+++ b/src/Decoder.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RuntimeException;
 use Zend\Json\Exception\InvalidArgumentException;
+use Zend\Json\Exception\RuntimeException;
 
 /**
  * Decode JSON encoded string to PHP variable constructs
@@ -550,4 +550,3 @@ protected static function _utf162utf8($utf16)
         return '';
     }
 }
-
diff --git a/src/Encoder.php b/src/Encoder.php
index f1d2ff697..09833963f 100644
--- a/src/Encoder.php
+++ b/src/Encoder.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RecursionException;
 use Zend\Json\Exception\InvalidArgumentException;
+use Zend\Json\Exception\RecursionException;
 
 /**
  * Encode PHP constructs to JSON
@@ -568,4 +568,3 @@ protected static function _utf82utf16($utf8)
         return '';
     }
 }
-
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 73b824e3e..5eb27525f 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -14,7 +14,6 @@
  * @category   Zend
  * @package    Zend_Json
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 102440885..0c6fd8a91 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -14,7 +14,5 @@
  * @category   Zend
  * @package    Zend_Json
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Json.php b/src/Json.php
index 5a7885dc0..87cef5e28 100644
--- a/src/Json.php
+++ b/src/Json.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RuntimeException;
 use Zend\Json\Exception\RecursionException;
+use Zend\Json\Exception\RuntimeException;
 
 /**
  * Class for encoding to and decoding from JSON.
diff --git a/src/Server/Cache.php b/src/Server/Cache.php
index 98b56e6ed..cd7f4d0d3 100644
--- a/src/Server/Cache.php
+++ b/src/Server/Cache.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Json\Server;
 
+use Zend\Server\Cache as ServerCache;
+
 /**
  * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
  *
@@ -17,7 +19,7 @@
  * @package    Zend_Json
  * @subpackage Server
  */
-class Cache extends \Zend\Server\Cache
+class Cache extends ServerCache
 {
     /**
      * Cache a service map description (SMD) to a file
diff --git a/src/Server/Error.php b/src/Server/Error.php
index 8e168329c..cd8ef745b 100644
--- a/src/Server/Error.php
+++ b/src/Server/Error.php
@@ -183,4 +183,3 @@ public function __toString()
         return $this->toJson();
     }
 }
-
diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
index 11ef42cfa..060d62be1 100644
--- a/src/Server/Exception/InvalidArgumentException.php
+++ b/src/Server/Exception/InvalidArgumentException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Json
  * @subpackage Server
  */
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
index 9b611d494..88f7f8b8b 100644
--- a/src/Server/Exception/RuntimeException.php
+++ b/src/Server/Exception/RuntimeException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Json
  * @subpackage Server
  */
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {}
diff --git a/src/Server/Request.php b/src/Server/Request.php
index 180831f62..61242e740 100644
--- a/src/Server/Request.php
+++ b/src/Server/Request.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Json\Server;
+
 use Zend\Json;
 
 /**
diff --git a/src/Server/Smd.php b/src/Server/Smd.php
index 70c5fca8e..c4f0f6a3e 100644
--- a/src/Server/Smd.php
+++ b/src/Server/Smd.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Json\Server;
+
 use Zend\Json\Server\Exception\InvalidArgumentException;
 use Zend\Json\Server\Exception\RuntimeException;
 
@@ -458,4 +459,3 @@ public function __toString()
         return $this->toJson();
     }
 }
-
diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
index 0bcd568ef..dc8b3bea6 100644
--- a/src/Server/Smd/Service.php
+++ b/src/Server/Smd/Service.php
@@ -9,9 +9,10 @@
  */
 
 namespace Zend\Json\Server\Smd;
-use Zend\Json\Server\Smd;
+
 use Zend\Json\Server;
 use Zend\Json\Server\Exception\InvalidArgumentException;
+use Zend\Json\Server\Smd;
 
 /**
  * Create Service Mapping Description for a method