diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php
index 29ceae95..9596d02a 100644
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@@ -12,7 +12,6 @@
 
 namespace PrivateBin\Data;
 
-use PrivateBin\Model\Paste;
 use PrivateBin\Persistence\DataStore;
 
 /**
@@ -72,7 +71,7 @@ class Filesystem extends AbstractData
      *
      * @access public
      * @param  string $pasteid
-     * @return stdClass|false
+     * @return \stdClass|false
      */
     public function read($pasteid)
     {
diff --git a/lib/Model.php b/lib/Model.php
index acc77f43..ed35ff0a 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -32,7 +32,7 @@ class Model
     /**
      * Data storage.
      *
-     * @var AbstractData
+     * @var Data\AbstractData
      */
     private $_store = null;
 
@@ -75,7 +75,7 @@ class Model
     /**
      * Gets, and creates if neccessary, a store object
      *
-     * @return AbstractData
+     * @return Data\AbstractData
      */
     private function _getStore()
     {
diff --git a/lib/Model/Comment.php b/lib/Model/Comment.php
index d20fa2a9..101335cb 100644
--- a/lib/Model/Comment.php
+++ b/lib/Model/Comment.php
@@ -38,7 +38,7 @@ class Comment extends AbstractModel
      *
      * @access public
      * @throws Exception
-     * @return stdClass
+     * @return \stdClass
      */
     public function get()
     {
diff --git a/lib/Model/Paste.php b/lib/Model/Paste.php
index 1beb6e86..3b57b87f 100644
--- a/lib/Model/Paste.php
+++ b/lib/Model/Paste.php
@@ -28,8 +28,8 @@ class Paste extends AbstractModel
      * Get paste data.
      *
      * @access public
-     * @throws Exception
-     * @return stdClass
+     * @throws \Exception
+     * @return \stdClass
      */
     public function get()
     {
diff --git a/lib/Persistence/DataStore.php b/lib/Persistence/DataStore.php
index 7ab4af59..5307811e 100644
--- a/lib/Persistence/DataStore.php
+++ b/lib/Persistence/DataStore.php
@@ -58,7 +58,7 @@ class DataStore extends AbstractPersistence
      * @access public
      * @static
      * @param  string $filename
-     * @return stdClass|false  $data
+     * @return \stdClass|false  $data
      */
     public static function get($filename)
     {
diff --git a/lib/Persistence/PurgeLimiter.php b/lib/Persistence/PurgeLimiter.php
index 93ea6caa..d54045c7 100644
--- a/lib/Persistence/PurgeLimiter.php
+++ b/lib/Persistence/PurgeLimiter.php
@@ -60,7 +60,7 @@ class PurgeLimiter extends AbstractPersistence
      *
      * @access public
      * @static
-     * @throws Exception
+     * @throws \Exception
      * @return bool
      */
     public static function canPurge()
diff --git a/lib/Persistence/TrafficLimiter.php b/lib/Persistence/TrafficLimiter.php
index 9b6152c5..24fe50a4 100644
--- a/lib/Persistence/TrafficLimiter.php
+++ b/lib/Persistence/TrafficLimiter.php
@@ -90,7 +90,7 @@ class TrafficLimiter extends AbstractPersistence
      *
      * @access public
      * @static
-     * @throws Exception
+     * @throws \Exception
      * @return bool
      */
     public static function canPass()