diff --git a/src/Basket.php b/src/Basket.php
index 3c4cd6d..c07545d 100755
--- a/src/Basket.php
+++ b/src/Basket.php
@@ -23,9 +23,7 @@
 use InvalidArgumentException;
 
 /**
- * Class Basket
- *
- * @package Lenius\Basket
+ * Class Basket.
  */
 class Basket
 {
@@ -107,9 +105,9 @@ public function insert(array $item)
     /**
      * Update an item.
      *
-     * @param string           $itemIdentifier The unique item identifier
+     * @param string       $itemIdentifier The unique item identifier
      * @param string|array $key            The key to update, or an array of key-value pairs
-     * @param mixed            $value          The value to set $key to
+     * @param mixed        $value          The value to set $key to
      *
      * @return void
      */
diff --git a/src/Identifier/Cookie.php b/src/Identifier/Cookie.php
index 6b2ff85..e3582cd 100755
--- a/src/Identifier/Cookie.php
+++ b/src/Identifier/Cookie.php
@@ -23,9 +23,7 @@
 use Lenius\Basket\IdentifierInterface;
 
 /**
- * Class Cookie
- *
- * @package Lenius\Basket\Identifier
+ * Class Cookie.
  */
 class Cookie implements IdentifierInterface
 {
diff --git a/src/Identifier/Runtime.php b/src/Identifier/Runtime.php
index 68f2bbf..f5201fe 100755
--- a/src/Identifier/Runtime.php
+++ b/src/Identifier/Runtime.php
@@ -23,9 +23,7 @@
 use Lenius\Basket\IdentifierInterface;
 
 /**
- * Class Runtime
- *
- * @package Lenius\Basket\Identifier
+ * Class Runtime.
  */
 class Runtime implements IdentifierInterface
 {
diff --git a/src/IdentifierInterface.php b/src/IdentifierInterface.php
index 68d135b..d34cc7a 100755
--- a/src/IdentifierInterface.php
+++ b/src/IdentifierInterface.php
@@ -21,9 +21,7 @@
 namespace Lenius\Basket;
 
 /**
- * Interface IdentifierInterface
- *
- * @package Lenius\Basket
+ * Interface IdentifierInterface.
  */
 interface IdentifierInterface
 {
diff --git a/src/Item.php b/src/Item.php
index cf67ae4..c47b402 100755
--- a/src/Item.php
+++ b/src/Item.php
@@ -21,14 +21,12 @@
 namespace Lenius\Basket;
 
 /**
- * Class Item
+ * Class Item.
  *
  * @property-read string $identifier
  * @property-read float $price
  * @property-read int $quantity
  * @property-read float $weight
- *
- * @package Lenius\Basket
  */
 class Item
 {
@@ -41,7 +39,7 @@ class Item
     /** @var Tax $tax */
     protected $tax;
 
-    /** @var array $data*/
+    /** @var array $data */
     protected $data = [];
 
     /**
@@ -150,7 +148,7 @@ public function total($includeTax = true)
             $price = $this->tax->add($price);
         }
 
-        return ($price * $this->quantity);
+        return $price * $this->quantity;
     }
 
     /**
@@ -170,7 +168,7 @@ public function weight()
             }
         }
 
-        return ($weight * $this->quantity);
+        return $weight * $this->quantity;
     }
 
     /**
diff --git a/src/Storage/Runtime.php b/src/Storage/Runtime.php
index ab17c7f..5d84800 100755
--- a/src/Storage/Runtime.php
+++ b/src/Storage/Runtime.php
@@ -24,9 +24,7 @@
 use Lenius\Basket\StorageInterface;
 
 /**
- * Class Runtime
- *
- * @package Lenius\Basket\Storage
+ * Class Runtime.
  */
 class Runtime implements StorageInterface
 {
diff --git a/src/Storage/Session.php b/src/Storage/Session.php
index bed5665..eaf023e 100755
--- a/src/Storage/Session.php
+++ b/src/Storage/Session.php
@@ -23,9 +23,7 @@
 use Lenius\Basket\StorageInterface;
 
 /**
- * Class Session
- *
- * @package Lenius\Basket\Storage
+ * Class Session.
  */
 class Session extends Runtime implements StorageInterface
 {
diff --git a/src/StorageInterface.php b/src/StorageInterface.php
index 618300e..177923a 100755
--- a/src/StorageInterface.php
+++ b/src/StorageInterface.php
@@ -21,9 +21,7 @@
 namespace Lenius\Basket;
 
 /**
- * Interface StorageInterface
- *
- * @package Lenius\Basket
+ * Interface StorageInterface.
  */
 interface StorageInterface
 {
diff --git a/src/Tax.php b/src/Tax.php
index 9f77710..e06a76a 100755
--- a/src/Tax.php
+++ b/src/Tax.php
@@ -21,9 +21,7 @@
 namespace Lenius\Basket;
 
 /**
- * Class Tax
- *
- * @package Lenius\Basket
+ * Class Tax.
  */
 class Tax
 {