diff --git a/src/PubSubHubbub/PubSubHubbub.php b/src/PubSubHubbub/PubSubHubbub.php
index cc40e61a..90c2f723 100644
--- a/src/PubSubHubbub/PubSubHubbub.php
+++ b/src/PubSubHubbub/PubSubHubbub.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\PubSubHubbub;
 
-use Zend\Feed\Reader,
-    Zend\Http;
+use Zend\Feed\Reader;
+use Zend\Http;
 
 /**
  * @category   Zend
diff --git a/src/PubSubHubbub/Subscriber/Callback.php b/src/PubSubHubbub/Subscriber/Callback.php
index f39e97d3..63337920 100644
--- a/src/PubSubHubbub/Subscriber/Callback.php
+++ b/src/PubSubHubbub/Subscriber/Callback.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\PubSubHubbub\Subscriber;
 
-use Zend\Feed\PubSubHubbub,
-    Zend\Uri;
+use Zend\Feed\PubSubHubbub;
+use Zend\Uri;
 
 /**
  * @category   Zend
diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index d95755cb..09b1a36b 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader;
 
-use DOMElement,
-    DOMDocument,
-    DOMXPath;
+use DOMElement;
+use DOMDocument;
+use DOMXPath;
 
 /**
  * @category   Zend
diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index 6623ee58..b14d83bb 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader;
 
-use DOMDocument,
-    DOMElement,
-    DOMXPath;
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
 
 /**
  * @category   Zend
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index bf27e6c6..d10774f3 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -20,11 +20,11 @@
  
 namespace Zend\Feed\Reader\Entry;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Exception,
-    DOMElement,
-    DOMDocument,
-    DOMXPath;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Exception;
+use DOMElement;
+use DOMDocument;
+use DOMXPath;
 
 /**
 * @category Zend
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index 3dbc0a07..9e09d0d9 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader\Entry;
 
-use Zend\Feed\Reader,
-    DOMElement,
-    DOMXPath;
+use Zend\Feed\Reader;
+use DOMElement;
+use DOMXPath;
 
 /**
 * @category Zend
@@ -374,6 +374,7 @@ public function getSource()
      * Set the XPath query (incl. on all Extensions)
      *
      * @param DOMXPath $xpath
+     * @return void
      */
     public function setXpath(DOMXPath $xpath)
     {
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index beedac08..a5e90da1 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -20,11 +20,11 @@
 
 namespace Zend\Feed\Reader\Entry;
 
-use Zend\Feed\Reader,
-    Zend\Date,
-    Zend\Feed\Reader\Exception,
-    DOMElement,
-    DOMXPath;
+use Zend\Feed\Reader;
+use Zend\Date;
+use Zend\Feed\Reader\Exception;
+use DOMElement;
+use DOMXPath;
 
 /**
 * @category Zend
@@ -228,7 +228,7 @@ public function getDateModified()
                         try {
                             $date->set($dateModified, $standard);
                             break;
-                        } catch (Date\Exception $e) {
+                        } catch (Date\Exception\ExceptionInterface $e) {
                             if ($standard == Date\Date::DATES) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
@@ -608,6 +608,7 @@ public function getCommentFeedLink()
      * Set the XPath query (incl. on all Extensions)
      *
      * @param DOMXPath $xpath
+     * @return void
      */
     public function setXpath(DOMXPath $xpath)
     {
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index 7b08ffd6..95f43f7c 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -20,10 +20,10 @@
 
 namespace Zend\Feed\Reader\Extension;
 
-use Zend\Feed\Reader,
-    DOMXPath,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Reader;
+use DOMXPath;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index c44a5669..934e856d 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader\Extension;
 
-use Zend\Feed\Reader,
-    DOMDocument,
-    DOMXPath;
+use Zend\Feed\Reader;
+use DOMDocument;
+use DOMXPath;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index 42667b86..1e0872ad 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -20,14 +20,14 @@
 
 namespace Zend\Feed\Reader\Extension\Atom;
 
-use DOMDocument,
-    DOMElement,
-    stdClass,
-    Zend\Date,
-    Zend\Feed\Reader,
-    Zend\Feed\Reader\Collection,
-    Zend\Feed\Reader\Extension,
-    Zend\Uri;
+use DOMDocument;
+use DOMElement;
+use stdClass;
+use Zend\Date;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Collection;
+use Zend\Feed\Reader\Extension;
+use Zend\Uri;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
index 10f2b860..f3d4101e 100644
--- a/src/Reader/Extension/Atom/Feed.php
+++ b/src/Reader/Extension/Atom/Feed.php
@@ -20,12 +20,12 @@
 
 namespace Zend\Feed\Reader\Extension\Atom;
 
-use Zend\Date,
-    Zend\Feed\Reader,
-    Zend\Feed\Reader\Collection,
-    Zend\Feed\Reader\Extension,
-    Zend\Uri,
-    DOMElement;
+use Zend\Date;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Collection;
+use Zend\Feed\Reader\Extension;
+use Zend\Uri;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/Content/Entry.php b/src/Reader/Extension/Content/Entry.php
index f83d5ff9..80e58737 100644
--- a/src/Reader/Extension/Content/Entry.php
+++ b/src/Reader/Extension/Content/Entry.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Reader\Extension\Content;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Extension;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Extension;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/CreativeCommons/Feed.php b/src/Reader/Extension/CreativeCommons/Feed.php
index b6634145..84afa1fc 100644
--- a/src/Reader/Extension/CreativeCommons/Feed.php
+++ b/src/Reader/Extension/CreativeCommons/Feed.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Reader\Extension\CreativeCommons;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Extension;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Extension;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index 452f55a1..e2e6db13 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -20,11 +20,11 @@
 
 namespace Zend\Feed\Reader\Extension\DublinCore;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Collection,
-    Zend\Feed\Reader\Extension,
-    Zend\Date,
-    DOMElement;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Collection;
+use Zend\Feed\Reader\Extension;
+use Zend\Date;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index 57f9bf61..d0542350 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -20,10 +20,10 @@
 
 namespace Zend\Feed\Reader\Extension\DublinCore;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Collection,
-    Zend\Feed\Reader\Extension,
-    Zend\Date;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Collection;
+use Zend\Feed\Reader\Extension;
+use Zend\Date;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/Podcast/Feed.php b/src/Reader/Extension/Podcast/Feed.php
index c5b81f36..59fdfb0b 100644
--- a/src/Reader/Extension/Podcast/Feed.php
+++ b/src/Reader/Extension/Podcast/Feed.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Reader\Extension\Podcast;
 
-use Zend\Feed\Reader\Extension,
-    DOMText;
+use Zend\Feed\Reader\Extension;
+use DOMText;
 
 /**
 * @category Zend
diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index 7f2b7ae1..c0b65b1e 100644
--- a/src/Reader/Extension/Syndication/Feed.php
+++ b/src/Reader/Extension/Syndication/Feed.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader\Extension\Syndication;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Extension,
-    Zend\Date;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Extension;
+use Zend\Date;
 
 /**
  * @category   Zend
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 500800b2..7f948241 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -20,10 +20,10 @@
  
 namespace Zend\Feed\Reader\Feed;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Exception,
-    DOMXPath,
-    DOMDocument;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Exception;
+use DOMXPath;
+use DOMDocument;
 
 /**
 * @category Zend
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index b1336381..4c5c0833 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader\Feed;
 
-use Zend\Feed\Reader,
-    Zend\Date,
-    DOMDocument;
+use Zend\Feed\Reader;
+use Zend\Date;
+use DOMDocument;
 
 /**
 * @category Zend
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index 3731f031..d8153867 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -20,11 +20,11 @@
 
 namespace Zend\Feed\Reader\Feed\Atom;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Feed,
-    Zend\Date,
-    DOMElement,
-    DOMXPath;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Feed;
+use Zend\Date;
+use DOMElement;
+use DOMXPath;
 
 /**
 * @category Zend
diff --git a/src/Reader/Feed/FeedInterface.php b/src/Reader/Feed/FeedInterface.php
index 93e38f22..dbc70c7d 100644
--- a/src/Reader/Feed/FeedInterface.php
+++ b/src/Reader/Feed/FeedInterface.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Reader\Feed;
 
-use Iterator,
-    Countable;
+use Iterator;
+use Countable;
 
 /**
 * @category Zend
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 03c36cd3..2667cea4 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -20,11 +20,11 @@
 
 namespace Zend\Feed\Reader\Feed;
 
-use Zend\Feed\Reader,
-    Zend\Feed\Reader\Collection,
-    Zend\Feed\Reader\Exception,
-    Zend\Date,
-    DOMDocument;
+use Zend\Feed\Reader;
+use Zend\Feed\Reader\Collection;
+use Zend\Feed\Reader\Exception;
+use Zend\Date;
+use DOMDocument;
 
 /**
 * @category Zend
@@ -220,7 +220,7 @@ public function getDateModified()
                         try {
                             $date->set($dateModified, $standard);
                             break;
-                        } catch (Date\Exception $e) {
+                        } catch (Date\Exception\ExceptionInterface $e) {
                             if ($standard == Date\Date::DATES) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
@@ -281,7 +281,7 @@ public function getLastBuildDate()
                         try {
                             $date->set($lastBuildDate, $standard);
                             break;
-                        } catch (Date\Exception $e) {
+                        } catch (Date\Exception\ExceptionInterface $e) {
                             if ($standard == Date\Date::DATES) {
                                 throw new Exception\RuntimeException(
                                     'Could not load date due to unrecognised'
diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index cdc51bb8..d0776d8b 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Reader;
 
-use ArrayObject,
-    DOMNodeList,
-    Zend\Uri;
+use ArrayObject;
+use DOMNodeList;
+use Zend\Uri;
 
 /**
 * @category Zend
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index ee42b652..e9521c1f 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -20,12 +20,12 @@
 
 namespace Zend\Feed\Reader;
 
-use Zend\Cache\Storage\StorageInterface as CacheStorage,
-    Zend\Http,
-    Zend\Loader,
-    Zend\Stdlib\ErrorHandler,
-    DOMDocument,
-    DOMXPath;
+use Zend\Cache\Storage\StorageInterface as CacheStorage;
+use Zend\Http;
+use Zend\Loader;
+use Zend\Stdlib\ErrorHandler;
+use DOMDocument;
+use DOMXPath;
 
 /**
 * @category Zend
diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
index 48c43351..e2f42523 100644
--- a/src/Writer/AbstractFeed.php
+++ b/src/Writer/AbstractFeed.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Writer;
 
-use Zend\Uri,
-    Zend\Date,
-    Zend\Validator;
+use Zend\Uri;
+use Zend\Date;
+use Zend\Validator;
 
 /**
  * @category Zend
diff --git a/src/Writer/Deleted.php b/src/Writer/Deleted.php
index 4dc82be6..83e81b69 100644
--- a/src/Writer/Deleted.php
+++ b/src/Writer/Deleted.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer;
 
-use Zend\Date,
-    Zend\Uri;
+use Zend\Date;
+use Zend\Uri;
 
 /**
 * @category Zend
diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
index a07b76d4..97343769 100644
--- a/src/Writer/Entry.php
+++ b/src/Writer/Entry.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Writer;
 
-use Zend\Feed\Writer\Exception,
-    Zend\Uri,
-    Zend\Date;
+use Zend\Feed\Writer\Exception;
+use Zend\Uri;
+use Zend\Date;
 
 /**
 * @category Zend
@@ -126,6 +126,7 @@ public function addAuthors(array $authors)
      * Set the feed character encoding
      *
      * @return string|null
+     * @throws Exception\InvalidArgumentException
      */
     public function setEncoding($encoding)
     {
diff --git a/src/Writer/Extension/AbstractRenderer.php b/src/Writer/Extension/AbstractRenderer.php
index baa56639..88907a85 100644
--- a/src/Writer/Extension/AbstractRenderer.php
+++ b/src/Writer/Extension/AbstractRenderer.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer\Extension;
 
-use DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/Atom/Renderer/Feed.php b/src/Writer/Extension/Atom/Renderer/Feed.php
index 5a9b5b9e..86e910b2 100644
--- a/src/Writer/Extension/Atom/Renderer/Feed.php
+++ b/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\Atom\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/Content/Renderer/Entry.php b/src/Writer/Extension/Content/Renderer/Entry.php
index a7669f97..5dd5ccbc 100644
--- a/src/Writer/Extension/Content/Renderer/Entry.php
+++ b/src/Writer/Extension/Content/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\Content\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/DublinCore/Renderer/Entry.php b/src/Writer/Extension/DublinCore/Renderer/Entry.php
index 8a2be91c..fcb03000 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/DublinCore/Renderer/Feed.php b/src/Writer/Extension/DublinCore/Renderer/Feed.php
index 05edddc0..4c02f81b 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
index 1d2308b2..591772fc 100644
--- a/src/Writer/Extension/ITunes/Entry.php
+++ b/src/Writer/Extension/ITunes/Entry.php
@@ -187,6 +187,7 @@ public function setItunesKeywords(array $value)
      * 
      * @param  string $value 
      * @return Entry
+     * @throws Writer\Exception\InvalidArgumentException
      */
     public function setItunesSubtitle($value)
     {
diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php
index 4f33f123..c57c9319 100644
--- a/src/Writer/Extension/ITunes/Feed.php
+++ b/src/Writer/Extension/ITunes/Feed.php
@@ -20,8 +20,8 @@
  
 namespace Zend\Feed\Writer\Extension\ITunes;
 
-use Zend\Feed\Writer,
-    Zend\Uri;
+use Zend\Feed\Writer;
+use Zend\Uri;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/ITunes/Renderer/Entry.php b/src/Writer/Extension/ITunes/Renderer/Entry.php
index dab3105a..4c2b860a 100644
--- a/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/src/Writer/Extension/ITunes/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/ITunes/Renderer/Feed.php b/src/Writer/Extension/ITunes/Renderer/Feed.php
index 77cabdbf..63c2d643 100644
--- a/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/Renderer.php b/src/Writer/Extension/Renderer.php
index 297664c4..5de01266 100644
--- a/src/Writer/Extension/Renderer.php
+++ b/src/Writer/Extension/Renderer.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer\Extension;
 
-use DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/Slash/Renderer/Entry.php b/src/Writer/Extension/Slash/Renderer/Entry.php
index d0b27c0e..51594837 100644
--- a/src/Writer/Extension/Slash/Renderer/Entry.php
+++ b/src/Writer/Extension/Slash/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\Slash\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/Threading/Renderer/Entry.php b/src/Writer/Extension/Threading/Renderer/Entry.php
index 24f90471..36db2d9f 100644
--- a/src/Writer/Extension/Threading/Renderer/Entry.php
+++ b/src/Writer/Extension/Threading/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\Threading\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index 38ac7ad9..25e99504 100644
--- a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -20,9 +20,9 @@
  
 namespace Zend\Feed\Writer\Extension\WellFormedWeb\Renderer;
 
-use Zend\Feed\Writer\Extension,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Extension;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php
index 8fd2bb85..9900abee 100644
--- a/src/Writer/Feed.php
+++ b/src/Writer/Feed.php
@@ -20,10 +20,10 @@
 
 namespace Zend\Feed\Writer;
 
-use Countable,
-    Iterator,
-    Zend\Date,
-    Zend\Feed\Writer\Renderer;
+use Countable;
+use Iterator;
+use Zend\Date;
+use Zend\Feed\Writer\Renderer;
 
 /**
 * @category Zend
diff --git a/src/Writer/FeedFactory.php b/src/Writer/FeedFactory.php
index 39079ed2..9425f42d 100644
--- a/src/Writer/FeedFactory.php
+++ b/src/Writer/FeedFactory.php
@@ -89,7 +89,7 @@ public static function factory($data)
      * Normalize a key
      * 
      * @param  string $key 
-     * @return void
+     * @return string
      */
     protected static function convertKey($key)
     {
diff --git a/src/Writer/Renderer/Entry/Atom.php b/src/Writer/Renderer/Entry/Atom.php
index 5e4b5d47..d6fc1f9c 100644
--- a/src/Writer/Renderer/Entry/Atom.php
+++ b/src/Writer/Renderer/Entry/Atom.php
@@ -20,13 +20,13 @@
 
 namespace Zend\Feed\Writer\Renderer\Entry;
 
-use DOMDocument,
-    DOMElement,
-    Zend\Date,
-    Zend\Feed\Writer,
-    Zend\Feed\Writer\Renderer,
-    Zend\Uri,
-    Zend\Validator;
+use DOMDocument;
+use DOMElement;
+use Zend\Date;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
+use Zend\Uri;
+use Zend\Validator;
 
 /**
  * @category Zend
@@ -86,6 +86,7 @@ public function render()
      * @param  DOMDocument $dom
      * @param  DOMElement $root
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
@@ -134,6 +135,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom
      * @param  DOMElement $root
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
@@ -259,6 +261,7 @@ protected function _setLink(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom
      * @param  DOMElement $root
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
@@ -287,7 +290,7 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
                 $this->getDataContainer()->getId())
             && !$this->_validateTagUri($this->getDataContainer()->getId())
         ) {
-            throw new Exception('Atom 1.0 IDs must be a valid URI/IRI');
+            throw new Writer\Exception\InvalidArgumentException('Atom 1.0 IDs must be a valid URI/IRI');
         }
         $id = $dom->createElement('id');
         $root->appendChild($id);
@@ -333,6 +336,7 @@ protected function _validateTagUri($id)
      * @param  DOMDocument $dom
      * @param  DOMElement $root
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setContent(DOMDocument $dom, DOMElement $root)
     {
diff --git a/src/Writer/Renderer/Entry/Atom/Deleted.php b/src/Writer/Renderer/Entry/Atom/Deleted.php
index 1b702091..0a151abb 100644
--- a/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer\Renderer\Entry\Atom;
 
-use DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
 
 /**
  * @category   Zend
diff --git a/src/Writer/Renderer/Entry/AtomDeleted.php b/src/Writer/Renderer/Entry/AtomDeleted.php
index f6912697..c1e47baa 100644
--- a/src/Writer/Renderer/Entry/AtomDeleted.php
+++ b/src/Writer/Renderer/Entry/AtomDeleted.php
@@ -20,10 +20,11 @@
 
 namespace Zend\Feed\Writer\Renderer\Entry;
 
-use Zend\Feed\Writer\Renderer,
-    Zend\Feed\Writer,
-    DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
+use Zend\Date;
+use Zend\Feed\Writer\Renderer;
+use Zend\Feed\Writer;
 
 /**
 * @category Zend
diff --git a/src/Writer/Renderer/Entry/Rss.php b/src/Writer/Renderer/Entry/Rss.php
index 5d4b1d0b..6744e874 100644
--- a/src/Writer/Renderer/Entry/Rss.php
+++ b/src/Writer/Renderer/Entry/Rss.php
@@ -20,12 +20,12 @@
 
 namespace Zend\Feed\Writer\Renderer\Entry;
 
-use Zend\Date,
-    Zend\Feed\Writer,
-    Zend\Feed\Writer\Renderer,
-    Zend\Uri,
-    DOMDocument,
-    DOMElement;
+use Zend\Date;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
+use Zend\Uri;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
@@ -85,6 +85,7 @@ public function render()
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
@@ -113,6 +114,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom
      * @param  DOMElement $root
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
@@ -210,6 +212,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
     {
diff --git a/src/Writer/Renderer/Feed/AbstractAtom.php b/src/Writer/Renderer/Feed/AbstractAtom.php
index e6b82659..1a26d30f 100644
--- a/src/Writer/Renderer/Feed/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -20,11 +20,11 @@
 
 namespace Zend\Feed\Writer\Renderer\Feed;
 
-use Zend\Feed\Writer\Renderer,
-    Zend\Date,
-    Zend\Feed\Writer,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed\Writer\Renderer;
+use Zend\Date;
+use Zend\Feed\Writer;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
@@ -66,6 +66,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
@@ -113,6 +114,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
@@ -188,6 +190,7 @@ protected function _setLink(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
     {
@@ -262,6 +265,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
diff --git a/src/Writer/Renderer/Feed/Atom.php b/src/Writer/Renderer/Feed/Atom.php
index ef113b0f..981b85cb 100644
--- a/src/Writer/Renderer/Feed/Atom.php
+++ b/src/Writer/Renderer/Feed/Atom.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Writer\Renderer\Feed;
 
-use Zend\Feed\Writer\Renderer,
-    Zend\Feed\Writer,
-    DOMDocument;
+use Zend\Feed\Writer\Renderer;
+use Zend\Feed\Writer;
+use DOMDocument;
 
 /**
 * @category Zend
diff --git a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 032d8390..eb817664 100644
--- a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -20,9 +20,9 @@
 
 namespace Zend\Feed\Writer\Renderer\Feed\Atom;
 
-use Zend\Feed,
-    DOMDocument,
-    DOMElement;
+use Zend\Feed;
+use DOMDocument;
+use DOMElement;
 
 /**
  * @category   Zend
@@ -112,6 +112,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Feed\Exception\InvalidArgumentException
      */
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
@@ -187,6 +188,7 @@ protected function _setLink(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Feed\Exception\InvalidArgumentException
      */
     protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
     {
@@ -261,6 +263,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Feed\Exception\InvalidArgumentException
      */
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
diff --git a/src/Writer/Renderer/Feed/Atom/Source.php b/src/Writer/Renderer/Feed/Atom/Source.php
index 5e34e05b..8958cd38 100644
--- a/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/src/Writer/Renderer/Feed/Atom/Source.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer\Renderer\Feed\Atom;
 
-use DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
 
 /**
  * @category   Zend
diff --git a/src/Writer/Renderer/Feed/AtomSource.php b/src/Writer/Renderer/Feed/AtomSource.php
index 20d08907..99be090c 100644
--- a/src/Writer/Renderer/Feed/AtomSource.php
+++ b/src/Writer/Renderer/Feed/AtomSource.php
@@ -20,10 +20,10 @@
  
 namespace Zend\Feed\Writer\Renderer\Feed;
 
-use Zend\Feed\Writer\Renderer,
-    Zend\Feed\Writer,
-    DOMElement,
-    DOMDocument;
+use Zend\Feed\Writer\Renderer;
+use Zend\Feed\Writer;
+use DOMElement;
+use DOMDocument;
 
 /**
 * @category Zend
diff --git a/src/Writer/Renderer/Feed/Rss.php b/src/Writer/Renderer/Feed/Rss.php
index 94c94c2e..56420c96 100644
--- a/src/Writer/Renderer/Feed/Rss.php
+++ b/src/Writer/Renderer/Feed/Rss.php
@@ -20,12 +20,12 @@
 
 namespace Zend\Feed\Writer\Renderer\Feed;
 
-use DOMDocument,
-    DOMElement,
-    Zend\Date,
-    Zend\Feed\Writer,
-    Zend\Feed\Writer\Renderer,
-    Zend\Uri;
+use DOMDocument;
+use DOMElement;
+use Zend\Date;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
+use Zend\Uri;
 
 /**
 * @category Zend
@@ -133,6 +133,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
@@ -160,6 +161,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
@@ -235,6 +237,7 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
@@ -309,6 +312,7 @@ protected function _setCopyright(DOMDocument $dom, DOMElement $root)
      * @param  DOMDocument $dom 
      * @param  DOMElement $root 
      * @return void
+     * @throws Writer\Exception\InvalidArgumentException
      */
     protected function _setImage(DOMDocument $dom, DOMElement $root)
     {
diff --git a/src/Writer/Renderer/RendererInterface.php b/src/Writer/Renderer/RendererInterface.php
index c2468aec..1d0f76c8 100644
--- a/src/Writer/Renderer/RendererInterface.php
+++ b/src/Writer/Renderer/RendererInterface.php
@@ -20,8 +20,8 @@
 
 namespace Zend\Feed\Writer\Renderer;
 
-use DOMDocument,
-    DOMElement;
+use DOMDocument;
+use DOMElement;
 
 /**
 * @category Zend
diff --git a/src/Writer/Writer.php b/src/Writer/Writer.php
index fbb472ef..c6b8b0ba 100644
--- a/src/Writer/Writer.php
+++ b/src/Writer/Writer.php
@@ -20,10 +20,10 @@
 
 namespace Zend\Feed\Writer;
 
-use Zend\Loader\ShortNameLocator,
-    Zend\Loader\PrefixPathLoader,
-    Zend\Loader\PrefixPathMapper,
-    Zend\Loader\Exception\PluginLoaderException;
+use Zend\Loader\ShortNameLocator;
+use Zend\Loader\PrefixPathLoader;
+use Zend\Loader\PrefixPathMapper;
+use Zend\Loader\Exception\PluginLoaderException;
 
 /**
 * @category Zend