diff --git a/src/Reader/Collection.php b/src/Reader/Collection.php
index 32144dfa..7385655e 100644
--- a/src/Reader/Collection.php
+++ b/src/Reader/Collection.php
@@ -9,9 +9,9 @@
 
 namespace Zend\Feed\Reader;
 
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
 
+class Collection extends ArrayObject
+{
 
 }
diff --git a/src/Reader/Collection/AbstractCollection.php b/src/Reader/Collection/AbstractCollection.php
index 8c64ec99..bf7d7ab2 100644
--- a/src/Reader/Collection/AbstractCollection.php
+++ b/src/Reader/Collection/AbstractCollection.php
@@ -9,7 +9,9 @@
 
 namespace Zend\Feed\Reader\Collection;
 
-abstract class AbstractCollection extends \ArrayObject
+use ArrayObject;
+
+abstract class AbstractCollection extends ArrayObject
 {
 
     /**
diff --git a/src/Reader/Collection/Collection.php b/src/Reader/Collection/Collection.php
index 820a695a..0e9d242d 100644
--- a/src/Reader/Collection/Collection.php
+++ b/src/Reader/Collection/Collection.php
@@ -9,9 +9,9 @@
 
 namespace Zend\Feed\Reader\Collection;
 
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
 
+class Collection extends ArrayObject
+{
 
 }
diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index 75f031b2..fbbf95fa 100644
--- a/src/Reader/Extension/Syndication/Feed.php
+++ b/src/Reader/Extension/Syndication/Feed.php
@@ -13,7 +13,7 @@
 use Zend\Feed\Reader;
 use Zend\Feed\Reader\Extension;
 
-class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
+class Feed extends Extension\AbstractFeed
 {
     /**
      * Get update period
@@ -46,6 +46,7 @@ public function getUpdatePeriod()
 
     /**
      * Get update frequency
+     * 
      * @return int
      */
     public function getUpdateFrequency()
@@ -63,6 +64,7 @@ public function getUpdateFrequency()
 
     /**
      * Get update frequency as ticks
+     * 
      * @return int
      */
     public function getUpdateFrequencyAsTicks()
diff --git a/src/Writer/Renderer/Entry/Atom/Deleted.php b/src/Writer/Renderer/Entry/Atom/Deleted.php
index 679b6c48..3cefe3e3 100644
--- a/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -12,17 +12,17 @@
 use DateTime;
 use DOMDocument;
 use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
 
-class Deleted
-    extends \Zend\Feed\Writer\Renderer\AbstractRenderer
-    implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
     /**
      * Constructor
      *
-     * @param  \Zend\Feed\Writer\Deleted $container
+     * @param  Writer\Deleted $container
      */
-    public function __construct (\Zend\Feed\Writer\Deleted $container)
+    public function __construct (Writer\Deleted $container)
     {
         parent::__construct($container);
     }
@@ -30,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Deleted $container)
     /**
      * Render atom entry
      *
-     * @return \Zend\Feed\Writer\Renderer\Entry\Atom
+     * @return Writer\Renderer\Entry\Atom
      */
     public function render()
     {
diff --git a/src/Writer/Renderer/Feed/Atom/Source.php b/src/Writer/Renderer/Feed/Atom/Source.php
index f9fbf2d9..e0284439 100644
--- a/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/src/Writer/Renderer/Feed/Atom/Source.php
@@ -11,16 +11,18 @@
 
 use DOMDocument;
 use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
 
-class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Source extends AbstractAtom implements Renderer\RendererInterface
 {
 
     /**
      * Constructor
      *
-     * @param  \Zend\Feed\Writer\Source $container
+     * @param  Writer\Source $container
      */
-    public function __construct (\Zend\Feed\Writer\Source $container)
+    public function __construct (Writer\Source $container)
     {
         parent::__construct($container);
     }
@@ -28,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Source $container)
     /**
      * Render Atom Feed Metadata (Source element)
      *
-     * @return \Zend\Feed\Writer\Renderer\Feed\Atom
+     * @return Writer\Renderer\Feed\Atom
      */
     public function render()
     {