diff --git a/AbstractFactory/AbstractFactory.php b/AbstractFactory/AbstractFactory.php
index b3794d9..e322325 100644
--- a/AbstractFactory/AbstractFactory.php
+++ b/AbstractFactory/AbstractFactory.php
@@ -28,6 +28,7 @@ abstract class AbstractFactory
      * Creates a text component
      * 
      * @param string $content
+     *
      * @return Text
      */
     abstract public function createText($content);
@@ -37,6 +38,7 @@ abstract class AbstractFactory
      * 
      * @param string $path
      * @param string $name
+     *
      * @return Picture
      */
     abstract public function createPicture($path, $name = '');
diff --git a/AbstractFactory/Html/Picture.php b/AbstractFactory/Html/Picture.php
index c678cf1..2e648b0 100644
--- a/AbstractFactory/Html/Picture.php
+++ b/AbstractFactory/Html/Picture.php
@@ -11,7 +11,6 @@ use DesignPatterns\AbstractFactory\Picture as BasePicture;
  */
 class Picture extends BasePicture
 {
-
     /**
      * some crude rendering from HTML output
      *
@@ -19,7 +18,6 @@ class Picture extends BasePicture
      */
     public function render()
     {
-        return sprintf('<img src="%s" title="$s"/>', $this->_path, $this->_name);
+        return sprintf('<img src="%s" title="$s"/>', $this->path, $this->name);
     }
-
 }
diff --git a/AbstractFactory/Html/Text.php b/AbstractFactory/Html/Text.php
index 4e626e2..8ea6d4f 100644
--- a/AbstractFactory/Html/Text.php
+++ b/AbstractFactory/Html/Text.php
@@ -11,7 +11,6 @@ use DesignPatterns\AbstractFactory\Text as BaseText;
  */
 class Text extends BaseText
 {
-
     /**
      * some crude rendering from HTML output
      *
@@ -19,7 +18,6 @@ class Text extends BaseText
      */
     public function render()
     {
-        return '<div>' . htmlspecialchars($this->_text) . '</div>';
+        return '<div>' . htmlspecialchars($this->text) . '</div>';
     }
-
 }
diff --git a/AbstractFactory/HtmlFactory.php b/AbstractFactory/HtmlFactory.php
index dad71b9..3606374 100644
--- a/AbstractFactory/HtmlFactory.php
+++ b/AbstractFactory/HtmlFactory.php
@@ -9,12 +9,12 @@ namespace DesignPatterns\AbstractFactory;
  */
 class HtmlFactory extends AbstractFactory
 {
-
     /**
      * Creates a picture component
      *
      * @param string $path
      * @param string $name
+     *
      * @return Html\Picture|Picture
      */
     public function createPicture($path, $name = '')
@@ -26,11 +26,11 @@ class HtmlFactory extends AbstractFactory
      * Creates a text component
      *
      * @param string $content
+     *
      * @return Html\Text|Text
      */
     public function createText($content)
     {
         return new Html\Text($content);
     }
-
 }
diff --git a/AbstractFactory/Json/Picture.php b/AbstractFactory/Json/Picture.php
index 179aa3a..4684191 100644
--- a/AbstractFactory/Json/Picture.php
+++ b/AbstractFactory/Json/Picture.php
@@ -11,7 +11,6 @@ use DesignPatterns\AbstractFactory\Picture as BasePicture;
  */
 class Picture extends BasePicture
 {
-
     /**
      * some crude rendering from JSON output
      *
@@ -19,7 +18,6 @@ class Picture extends BasePicture
      */
     public function render()
     {
-        return json_encode(array('title' => $this->_name, 'path' => $this->_path));
+        return json_encode(array('title' => $this->name, 'path' => $this->path));
     }
-
 }
diff --git a/AbstractFactory/Json/Text.php b/AbstractFactory/Json/Text.php
index 91115e8..83d0877 100644
--- a/AbstractFactory/Json/Text.php
+++ b/AbstractFactory/Json/Text.php
@@ -11,7 +11,6 @@ use DesignPatterns\AbstractFactory\Text as BaseText;
  */
 class Text extends BaseText
 {
-
     /**
      * some crude rendering from JSON output
      *
@@ -19,7 +18,6 @@ class Text extends BaseText
      */
     public function render()
     {
-        return json_encode(array('content' => $this->_text));
+        return json_encode(array('content' => $this->text));
     }
-
 }
diff --git a/AbstractFactory/JsonFactory.php b/AbstractFactory/JsonFactory.php
index 814fbaf..6cf15d2 100644
--- a/AbstractFactory/JsonFactory.php
+++ b/AbstractFactory/JsonFactory.php
@@ -16,6 +16,7 @@ class JsonFactory extends AbstractFactory
      *
      * @param string $path
      * @param string $name
+     *
      * @return Json\Picture|Picture
      */
     public function createPicture($path, $name = '')
@@ -23,16 +24,15 @@ class JsonFactory extends AbstractFactory
         return new Json\Picture($path, $name);
     }
 
-
     /**
      * Creates a text component
      *
      * @param string $content
+     *
      * @return Json\Text|Text
      */
     public function createText($content)
     {
         return new Json\Text($content);
     }
-
 }
diff --git a/AbstractFactory/Media.php b/AbstractFactory/MediaInterface.php
similarity index 77%
rename from AbstractFactory/Media.php
rename to AbstractFactory/MediaInterface.php
index 53a66c1..92d0089 100644
--- a/AbstractFactory/Media.php
+++ b/AbstractFactory/MediaInterface.php
@@ -3,12 +3,12 @@
 namespace DesignPatterns\AbstractFactory;
 
 /**
- * Interface Media
+ * Interface MediaInterface
  *
  * This contract is not part of the pattern, in general case, each component
  * are not related
  */
-interface Media
+interface MediaInterface
 {
 
     /**
@@ -16,5 +16,5 @@ interface Media
      *
      * @return string
      */
-    function render();
+    public function render();
 }
diff --git a/AbstractFactory/Picture.php b/AbstractFactory/Picture.php
index 6d9647e..264bfb6 100644
--- a/AbstractFactory/Picture.php
+++ b/AbstractFactory/Picture.php
@@ -5,7 +5,7 @@ namespace DesignPatterns\AbstractFactory;
 /**
  * Class Picture
  */
-abstract class Picture implements Media
+abstract class Picture implements MediaInterface
 {
 
     /**
diff --git a/AbstractFactory/Text.php b/AbstractFactory/Text.php
index a45d7f2..675e6d5 100644
--- a/AbstractFactory/Text.php
+++ b/AbstractFactory/Text.php
@@ -5,7 +5,7 @@ namespace DesignPatterns\AbstractFactory;
 /**
  * Class Text
  */
-abstract class Text implements Media
+abstract class Text implements MediaInterface
 {
     /**
      * @var string
diff --git a/Adapter/Book.php b/Adapter/Book.php
index dcd3b0f..d993891 100644
--- a/Adapter/Book.php
+++ b/Adapter/Book.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Adapter;
 
 /**
@@ -11,15 +7,19 @@ namespace DesignPatterns\Adapter;
  */
 class Book implements PaperBookInterface
 {
-
+    /**
+     * {@inheritdoc}
+     */
     public function open()
     {
-        
+
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function turnPage()
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/Adapter/ElecBookAdapter.php b/Adapter/EBookAdapter.php
similarity index 67%
rename from Adapter/ElecBookAdapter.php
rename to Adapter/EBookAdapter.php
index 49670af..9677553 100644
--- a/Adapter/ElecBookAdapter.php
+++ b/Adapter/EBookAdapter.php
@@ -1,26 +1,26 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Adapter;
 
 /**
- * ElecBookAdapter is an adapter to fit an e-book like a paper book
+ * EBookAdapter is an adapter to fit an e-book like a paper book
  * 
  * This is the adapter here. Notice it implemennts PaperBookInterface,
  * therefore you don't have to change the code of the client which using paper book.
  */
-class ElecBookAdapter implements PaperBookInterface
+class EBookAdapter implements PaperBookInterface
 {
-
+    /**
+     * @var EBookInterface
+     */
     protected $eBook;
 
     /**
      * Notice the constructor, it "wraps" an electronic book
+     *
+     * @param EBookInterface $ebook
      */
-    public function __construct(ElecBookInterface $ebook)
+    public function __construct(EBookInterface $ebook)
     {
         $this->eBook = $ebook;
     }
@@ -33,9 +33,11 @@ class ElecBookAdapter implements PaperBookInterface
         $this->eBook->pressStart();
     }
 
+    /**
+     * turns pages
+     */
     public function turnPage()
     {
         $this->eBook->pressNext();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Adapter/EBookInterface.php b/Adapter/EBookInterface.php
new file mode 100644
index 0000000..86eed82
--- /dev/null
+++ b/Adapter/EBookInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DesignPatterns\Adapter;
+
+/**
+ * EBookInterface is a contract for an electronic book
+ */
+interface EBookInterface
+{
+    /**
+     * go to next page
+     *
+     * @return mixed
+     */
+    public function pressNext();
+
+    /**
+     * start the book
+     *
+     * @return mixed
+     */
+    public function pressStart();
+}
diff --git a/Adapter/ElecBookInterface.php b/Adapter/ElecBookInterface.php
deleted file mode 100644
index b16bd35..0000000
--- a/Adapter/ElecBookInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\Adapter;
-
-/**
- * ElecBookInterface is a contract for an electronic book
- */
-interface ElecBookInterface
-{
-
-    function pressNext();
-
-    function pressStart();
-}
\ No newline at end of file
diff --git a/Adapter/Kindle.php b/Adapter/Kindle.php
index c5134c8..72d89e6 100644
--- a/Adapter/Kindle.php
+++ b/Adapter/Kindle.php
@@ -1,27 +1,25 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Adapter;
 
 /**
  * Kindle is a concrete electronic book
- *
- * @author flo
  */
-class Kindle implements ElecBookInterface
+class Kindle implements EBookInterface
 {
-
+    /**
+     * {@inheritdoc}
+     */
     public function pressNext()
     {
-        
+
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function pressStart()
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/Adapter/PaperBookInterface.php b/Adapter/PaperBookInterface.php
index 282ca09..be748eb 100644
--- a/Adapter/PaperBookInterface.php
+++ b/Adapter/PaperBookInterface.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Adapter;
 
 /**
@@ -11,8 +7,17 @@ namespace DesignPatterns\Adapter;
  */
 interface PaperBookInterface
 {
+    /**
+     * method to turn pages
+     *
+     * @return mixed
+     */
+    public function turnPage();
 
-    function turnPage();
-
-    function open();
-}
\ No newline at end of file
+    /**
+     * method to open the book
+     *
+     * @return mixed
+     */
+    public function open();
+}
diff --git a/Builder/BikeBuilder.php b/Builder/BikeBuilder.php
index bb63fdf..a6f1a30 100644
--- a/Builder/BikeBuilder.php
+++ b/Builder/BikeBuilder.php
@@ -1,43 +1,55 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder;
 
 /**
  * BikeBuilder builds bike
  */
-class BikeBuilder implements Builder
+class BikeBuilder implements BuilderInterface
 {
-
+    /**
+     * @var Parts\Bike
+     */
     protected $bike;
 
+    /**
+     * {@inheritdoc}
+     */
     public function addDoors()
     {
-        
+
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function addEngine()
     {
         $this->bike->setPart('engine', new Parts\Engine());
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function addWheel()
     {
         $this->bike->setPart('forwardWheel', new Parts\Wheel());
         $this->bike->setPart('rearWheel', new Parts\Wheel());
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function createVehicle()
     {
         $this->bike = new Parts\Bike();
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getVehicle()
     {
         return $this->bike;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Builder/Builder.php b/Builder/BuilderInterface.php
similarity index 57%
rename from Builder/Builder.php
rename to Builder/BuilderInterface.php
index a696936..f52b56f 100644
--- a/Builder/Builder.php
+++ b/Builder/BuilderInterface.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder;
 
 /**
@@ -18,16 +14,30 @@ namespace DesignPatterns\Builder;
  * Note: Builders have often a fluent interface, see the mock builder of
  * PHPUnit for example.
  */
-interface Builder
+interface BuilderInterface
 {
+    /**
+     * @return mixed
+     */
+    public function createVehicle();
 
-    function createVehicle();
+    /**
+     * @return mixed
+     */
+    public function addWheel();
 
-    function addWheel();
+    /**
+     * @return mixed
+     */
+    public function addEngine();
 
-    function addEngine();
+    /**
+     * @return mixed
+     */
+    public function addDoors();
 
-    function addDoors();
-
-    function getVehicle();
-}
\ No newline at end of file
+    /**
+     * @return mixed
+     */
+    public function getVehicle();
+}
diff --git a/Builder/CarBuilder.php b/Builder/CarBuilder.php
index 867c038..b89ee20 100644
--- a/Builder/CarBuilder.php
+++ b/Builder/CarBuilder.php
@@ -1,30 +1,37 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder;
 
 /**
  * CarBuilder builds car
  */
-class CarBuilder implements Builder
+class CarBuilder implements BuilderInterface
 {
-
+    /**
+     * @var Parts\Car
+     */
     protected $car;
 
+    /**
+     * @return void
+     */
     public function addDoors()
     {
         $this->car->setPart('rightdoor', new Parts\Door());
         $this->car->setPart('leftDoor', new Parts\Door());
     }
 
+    /**
+     * @return void
+     */
     public function addEngine()
     {
         $this->car->setPart('engine', new Parts\Engine());
     }
 
+    /**
+     * @return void
+     */
     public function addWheel()
     {
         $this->car->setPart('wheelLF', new Parts\Wheel());
@@ -33,14 +40,19 @@ class CarBuilder implements Builder
         $this->car->setPart('wheelRR', new Parts\Wheel());
     }
 
+    /**
+     * @return void
+     */
     public function createVehicle()
     {
         $this->car = new Parts\Car();
     }
 
+    /**
+     * @return Parts\Car
+     */
     public function getVehicle()
     {
         return $this->car;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Builder/Director.php b/Builder/Director.php
index 7a55a0d..6a04fad 100644
--- a/Builder/Director.php
+++ b/Builder/Director.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder;
 
 /**
@@ -18,8 +14,12 @@ class Director
 
     /**
      * The director don't know 'bout concrete part
+     *
+     * @param BuilderInterface $builder
+     *
+     * @return Parts\Vehicle
      */
-    public function build(Builder $builder)
+    public function build(BuilderInterface $builder)
     {
         $builder->createVehicle();
         $builder->addDoors();
@@ -28,5 +28,4 @@ class Director
 
         return $builder->getVehicle();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Builder/Parts/Bike.php b/Builder/Parts/Bike.php
index b10ad1f..6ffa4e2 100644
--- a/Builder/Parts/Bike.php
+++ b/Builder/Parts/Bike.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder\Parts;
 
 /**
@@ -11,5 +7,5 @@ namespace DesignPatterns\Builder\Parts;
  */
 class Bike extends Vehicle
 {
-    
-}
\ No newline at end of file
+
+}
diff --git a/Builder/Parts/Car.php b/Builder/Parts/Car.php
index 1d7a05c..e3bc455 100644
--- a/Builder/Parts/Car.php
+++ b/Builder/Parts/Car.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder\Parts;
 
 /**
@@ -11,5 +7,5 @@ namespace DesignPatterns\Builder\Parts;
  */
 class Car extends Vehicle
 {
-    
-}
\ No newline at end of file
+
+}
diff --git a/Builder/Parts/Door.php b/Builder/Parts/Door.php
index cbe9b63..ccad7ac 100644
--- a/Builder/Parts/Door.php
+++ b/Builder/Parts/Door.php
@@ -2,7 +2,10 @@
 
 namespace DesignPatterns\Builder\Parts;
 
+/**
+ * Class Door
+ */
 class Door
 {
-    
-}
\ No newline at end of file
+
+}
diff --git a/Builder/Parts/Engine.php b/Builder/Parts/Engine.php
index 2231026..20410b1 100644
--- a/Builder/Parts/Engine.php
+++ b/Builder/Parts/Engine.php
@@ -2,7 +2,10 @@
 
 namespace DesignPatterns\Builder\Parts;
 
+/**
+ * Class Engine
+ */
 class Engine
 {
-    
-}
\ No newline at end of file
+
+}
diff --git a/Builder/Parts/Vehicle.php b/Builder/Parts/Vehicle.php
index 7f627b7..88f266f 100644
--- a/Builder/Parts/Vehicle.php
+++ b/Builder/Parts/Vehicle.php
@@ -1,22 +1,23 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Builder\Parts;
 
 /**
- * Vehicle is a contract for a vehicle
+ * VehicleInterface is a contract for a vehicle
  */
 abstract class Vehicle
 {
-
+    /**
+     * @var array
+     */
     protected $data;
 
+    /**
+     * @param string $key
+     * @param mixed  $value
+     */
     public function setPart($key, $value)
     {
         $this->data[$key] = $value;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Builder/Parts/Wheel.php b/Builder/Parts/Wheel.php
index d2b8950..71337e4 100644
--- a/Builder/Parts/Wheel.php
+++ b/Builder/Parts/Wheel.php
@@ -2,7 +2,10 @@
 
 namespace DesignPatterns\Builder\Parts;
 
+/**
+ * Class Wheel
+ */
 class Wheel
 {
-    
-}
\ No newline at end of file
+
+}
diff --git a/ChainOfResponsibilities/ChainOfResponsibilities.php b/ChainOfResponsibilities/ChainOfResponsibilities.php
deleted file mode 100644
index 5b2686d..0000000
--- a/ChainOfResponsibilities/ChainOfResponsibilities.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace DesignPatterns;
-
-/**
- * chain of responsibilities pattern
- *
- * Purpose:
- * to build a chain of objects to handle a call. if one object cannot handle a call, it delegates the call to the next
- * in the chain and so forth
- *
- * Examples:
- * - logging framework
- * - spam filter
- * - Caching: first object is an instance of e.g. a Memcached Interface, if that "misses" it delegates the call to the
- *   Database Interface
- * - Yii Framework: CFilterChain is a chain of controller action filters. the executing point is passed from one filter
- *   to the next along the chain, and only if all filters say "yes", the action can be invoked at last.
- *
- */
-
-// the idea is good but in general, the Handler component in this pattern 
-// is an abstract class which makes much more of the work
-interface KeyValueStorage
-{
-    public function get($key);
-}
-
-class SlowStorage implements KeyValueStorage
-{
-    protected $_data = array();
-
-    public function __construct($data = array())
-    {
-        $this->_data = $data;
-    }
-
-    /**
-     * this class has no next handler, so it MUST be able to handle all requests
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return $this->_data[$key];
-    }
-}
-
-class FastStorage implements KeyValueStorage
-{
-    /**
-     * @var array
-     */
-    protected $_data;
-
-    /**
-     * the next handler in the chain
-     *
-     * @var \DesignPatterns\KeyValueStorage
-     */
-    protected $_nextHandler;
-
-    public function __construct(array $data, KeyValueStorage $nextHandler)
-    {
-        $this->_data = $data;
-        $this->_nextHandler = $nextHandler;
-    }
-
-    /**
-     * when this storage gets a "miss", search in next handler
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        if (true /* miss */) {
-            // delegate the call to the next handler in the chain
-            return $this->_nextHandler->get($key);
-        }
-    }
-}
-
-// BUILD THE STORAGES AND CHAIN
-
-$slowStorage = new SlowStorage(array('foo' => 'bar'));
-$fastStorage = new FastStorage(array('bar' => 'baz'), $slowStorage);
-
-$fastStorage->get('foo'); // will be handled by SlowStorage
-$fastStorage->get('bar'); // will be handled by FastStorage
-
-/**
- * In this example we could also add a abstract class and extend it to build Fast- and SlowStorage. That class would
- * then manage the chain and when the cache hits a "miss", it would check if there is a next handler
- */
\ No newline at end of file
diff --git a/ChainOfResponsibilities/Handler.php b/ChainOfResponsibilities/Handler.php
index 907e6a9..35ec769 100644
--- a/ChainOfResponsibilities/Handler.php
+++ b/ChainOfResponsibilities/Handler.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\ChainOfResponsibilities;
 
 /**
@@ -16,7 +12,9 @@ namespace DesignPatterns\ChainOfResponsibilities;
  */
 abstract class Handler
 {
-
+    /**
+     * @var Handler
+     */
     private $successor = null;
 
     /**
@@ -24,14 +22,16 @@ abstract class Handler
      * 
      * A prepend method could be done with the same spirit
      * 
-     * You could also send the successor in the contructor but in PHP it is a
+     * You could also send the successor in the constructor but in PHP it is a
      * bad idea because you have to remove the type-hint of the parameter because
      * the last handler has a null successor.
      * 
-     * And if you override the contructor, that Handler can no longer have a
+     * And if you override the constructor, that Handler can no longer have a
      * successor. One solution is to provide a NullObject (see pattern).
      * It is more preferable to keep the constructor "free" to inject services
      * you need with the DiC of symfony2 for example.
+     *
+     * @param Handler $handler
      */
     final public function append(Handler $handler)
     {
@@ -48,6 +48,10 @@ abstract class Handler
      * This approach by using a template method pattern ensures you that 
      * each subclass will not forget to call the successor. Beside, the returned
      * boolean value indicates you if the request have been processed or not.
+     *
+     * @param Request $req
+     *
+     * @return bool
      */
     final public function handle(Request $req)
     {
@@ -65,8 +69,10 @@ abstract class Handler
 
     /**
      * Each concrete handler has to implement the processing of the request
-     * 
+     *
+     * @param Request $req
+     *
      * @return bool true if the request has been processed
      */
     abstract protected function processing(Request $req);
-}
\ No newline at end of file
+}
diff --git a/ChainOfResponsibilities/README.md b/ChainOfResponsibilities/README.md
new file mode 100644
index 0000000..44496bf
--- /dev/null
+++ b/ChainOfResponsibilities/README.md
@@ -0,0 +1,13 @@
+# chain of responsibilities
+
+## Purpose:
+
+To build a chain of objects to handle a call. if one object cannot handle a call, it delegates the call to the next
+in the chain and so forth
+
+## Examples:
+
+*  logging framework
+*  spam filter
+  Caching: first object is an instance of e.g. a Memcached Interface, if that "misses" it delegates the call to the database interface
+*  Yii Framework: CFilterChain is a chain of controller action filters. the executing point is passed from one filter to the next along the chain, and only if all filters say "yes", the action can be invoked at last.
\ No newline at end of file
diff --git a/ChainOfResponsibilities/Request.php b/ChainOfResponsibilities/Request.php
index 6083c57..501446a 100644
--- a/ChainOfResponsibilities/Request.php
+++ b/ChainOfResponsibilities/Request.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\ChainOfResponsibilities;
 
 /**
@@ -20,4 +16,4 @@ namespace DesignPatterns\ChainOfResponsibilities;
 class Request
 {
     // getter and setter but I don't want to generate to much noise in handlers
-}
\ No newline at end of file
+}
diff --git a/ChainOfResponsibilities/Responsible/FastStorage.php b/ChainOfResponsibilities/Responsible/FastStorage.php
index 0011ea0..d02fb5a 100644
--- a/ChainOfResponsibilities/Responsible/FastStorage.php
+++ b/ChainOfResponsibilities/Responsible/FastStorage.php
@@ -1,30 +1,34 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\ChainOfResponsibilities\Responsible;
 
 use DesignPatterns\ChainOfResponsibilities\Handler;
 use DesignPatterns\ChainOfResponsibilities\Request;
 
+/**
+ * Class FastStorage
+ */
 class FastStorage extends Handler
 {
+    /**
+     * @var array
+     */
+    protected $data = array();
 
-    protected $_data = array();
-
+    /**
+     * @param array $data
+     */
     public function __construct($data = array())
     {
-        $this->_data = $data;
+        $this->data = $data;
     }
 
     protected function processing(Request $req)
     {
         if ('get' === $req->verb) {
-            if (array_key_exists($req->key, $this->_data)) {
+            if (array_key_exists($req->key, $this->data)) {
                 // the handler IS responsible and then processes the request
-                $req->response = $this->_data[$req->key];
+                $req->response = $this->data[$req->key];
                 // instead of returning true, I could return the value but it proves
                 // to be a bad idea. What if the value IS "false" ?
                 return true;
@@ -33,5 +37,4 @@ class FastStorage extends Handler
 
         return false;
     }
-
 }
diff --git a/ChainOfResponsibilities/Responsible/SlowStorage.php b/ChainOfResponsibilities/Responsible/SlowStorage.php
index 79635bf..8d64484 100644
--- a/ChainOfResponsibilities/Responsible/SlowStorage.php
+++ b/ChainOfResponsibilities/Responsible/SlowStorage.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\ChainOfResponsibilities\Responsible;
 
 use DesignPatterns\ChainOfResponsibilities\Handler;
@@ -21,24 +17,29 @@ use DesignPatterns\ChainOfResponsibilities\Request;
  */
 class SlowStorage extends Handler
 {
+    /**
+     * @var array
+     */
+    protected $data = array();
 
-    protected $_data = array();
-
+    /**
+     * @param array $data
+     */
     public function __construct($data = array())
     {
-        $this->_data = $data;
+        $this->data = $data;
     }
 
     protected function processing(Request $req)
     {
         if ('get' === $req->verb) {
-            if (array_key_exists($req->key, $this->_data)) {
-                $req->response = $this->_data[$req->key];
+            if (array_key_exists($req->key, $this->data)) {
+                $req->response = $this->data[$req->key];
+
                 return true;
             }
         }
 
         return false;
     }
-
 }
diff --git a/Command/Command.php b/Command/CommandInterface.php
similarity index 97%
rename from Command/Command.php
rename to Command/CommandInterface.php
index 005d0b6..8fe9c5b 100644
--- a/Command/Command.php
+++ b/Command/CommandInterface.php
@@ -23,9 +23,8 @@ namespace DesignPatterns\Command;
  *   can be implemented with the Command pattern (e.g. vagrant)
  *
  */
-interface Command
+interface CommandInterface
 {
-
     /**
      * this is the most important method in the Command pattern,
      * The Receiver goes in the constructor.
diff --git a/Command/HelloCommand.php b/Command/HelloCommand.php
index 1ba3ecb..9bb0956 100644
--- a/Command/HelloCommand.php
+++ b/Command/HelloCommand.php
@@ -6,25 +6,31 @@ namespace DesignPatterns\Command;
  * This concrete command calls "print" on the Receiver, but an external
  * invoker just know he can call "execute" 
  */
-class HelloCommand implements Command
+class HelloCommand implements CommandInterface
 {
-
+    /**
+     * @var Receiver
+     */
     protected $output;
 
     /**
      * Each concrete command is builded with different receivers.
-     * Can be one, many, none or even other Command in parameters 
+     * Can be one, many, none or even other Command in parameters
+     *
+     * @param Receiver $console
      */
     public function __construct(Receiver $console)
     {
         $this->output = $console;
     }
 
+    /**
+     * execute and output "Hello World"
+     */
     public function execute()
     {
-        // sometimes, there is no receiver and this is the command which 
+        // sometimes, there is no receiver and this is the command which
         // does all the work
         $this->output->write('Hello World');
     }
-
-}
\ No newline at end of file
+}
diff --git a/Command/Invoker.php b/Command/Invoker.php
index 75d7a23..6f857ec 100644
--- a/Command/Invoker.php
+++ b/Command/Invoker.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Command;
 
 /**
@@ -12,23 +8,29 @@ namespace DesignPatterns\Command;
  */
 class Invoker
 {
-
+    /**
+     * @var CommandInterface
+     */
     protected $command;
 
     /**
      * In the invoker we find this kind of method for subscribing the command.
      * There can be also a stack, a list, a fixed set...
+     *
+     * @param CommandInterface $cmd
      */
-    public function setCommand(Command $cmd)
+    public function setCommand(CommandInterface $cmd)
     {
         $this->command = $cmd;
     }
 
+    /**
+     * executes the command
+     */
     public function run()
     {
         // here is a key feature of the invoker
         // the invoker is the same whatever is the command
         $this->command->execute();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Command/Receiver.php b/Command/Receiver.php
index a9b6516..f52accb 100644
--- a/Command/Receiver.php
+++ b/Command/Receiver.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Command;
 
 /**
@@ -11,10 +7,11 @@ namespace DesignPatterns\Command;
  */
 class Receiver
 {
-
+    /**
+     * @param string $str
+     */
     public function write($str)
     {
         echo $str;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Composite/Form.php b/Composite/Form.php
index 0cc16e1..decc599 100644
--- a/Composite/Form.php
+++ b/Composite/Form.php
@@ -3,7 +3,7 @@
 namespace DesignPatterns\Composite;
 
 /**
- * composite pattern
+ * Composite pattern
  *
  * Purpose:
  * to treat a group of objects the same way as a single instance of the object
@@ -18,7 +18,10 @@ namespace DesignPatterns\Composite;
  */
 class Form extends FormElement
 {
-    protected $_elements;
+    /**
+     * @var array|FormElement[]
+     */
+    protected $elements;
 
     /**
      * runs through all elements and calls render() on them, then returns the complete representation
@@ -26,20 +29,26 @@ class Form extends FormElement
      *
      * from the outside, one will not see this and the form will act like a single object instance
      *
+     * @param int $indent
+     *
      * @return string
      */
     public function render($indent = 0)
     {
         $formCode = '';
-        foreach ($this->_elements as $element) {
+
+        foreach ($this->elements as $element) {
             $formCode .= $element->render($indent + 1) . PHP_EOL;
         }
 
         return $formCode;
     }
 
+    /**
+     * @param FormElement $element
+     */
     public function addElement(FormElement $element)
     {
-        $this->_elements[] = $element;
+        $this->elements[] = $element;
     }
 }
diff --git a/Composite/FormElement.php b/Composite/FormElement.php
index 3e3de93..ab95c67 100644
--- a/Composite/FormElement.php
+++ b/Composite/FormElement.php
@@ -2,7 +2,17 @@
 
 namespace DesignPatterns\Composite;
 
+/**
+ * Class FormElement
+ */
 abstract class FormElement
 {
+    /**
+     * renders the elements' code
+     *
+     * @param int $indent
+     *
+     * @return mixed
+     */
     abstract public function render($indent = 0);
 }
diff --git a/Composite/InputElement.php b/Composite/InputElement.php
index 786df45..7a65241 100644
--- a/Composite/InputElement.php
+++ b/Composite/InputElement.php
@@ -2,8 +2,18 @@
 
 namespace DesignPatterns\Composite;
 
+/**
+ * Class InputElement
+ */
 class InputElement extends FormElement
 {
+    /**
+     * renders the input element HTML
+     *
+     * @param int $indent
+     *
+     * @return mixed|string
+     */
     public function render($indent = 0)
     {
         return str_repeat('  ', $indent) . '<input type="text" />';
diff --git a/Composite/TextElement.php b/Composite/TextElement.php
index c8214ca..9ea4a4e 100644
--- a/Composite/TextElement.php
+++ b/Composite/TextElement.php
@@ -2,8 +2,18 @@
 
 namespace DesignPatterns\Composite;
 
+/**
+ * Class TextElement
+ */
 class TextElement extends FormElement
 {
+    /**
+     * renders the text element
+     *
+     * @param int $indent
+     *
+     * @return mixed|string
+     */
     public function render($indent = 0)
     {
         return str_repeat('  ', $indent) . 'this is a text element';
diff --git a/DataMapper/User.php b/DataMapper/User.php
index cd8afb1..12f8779 100644
--- a/DataMapper/User.php
+++ b/DataMapper/User.php
@@ -42,43 +42,48 @@ class User
     /**
      * @return int
      */
-    public function getUserId() {
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
     /**
      * @param int $userId
      */
-    public function setUserID($userId) {
-		$this->userId = $userId;
-	}
+    public function setUserID($userId)
+    {
+        $this->userId = $userId;
+    }
 
     /**
      * @return string
      */
-    public function getUsername() {
-		return $this->username;
-	}
+    public function getUsername()
+    {
+        return $this->username;
+    }
 
     /**
      * @param string $username
      */
-    public function setUsername($username) {
-		$this->username = $username;
-	}
+    public function setUsername($username)
+    {
+        $this->username = $username;
+    }
 
     /**
      * @return string
      */
-    public function getEmail() {
-		return $this->email;
-	}
+    public function getEmail()
+    {
+        return $this->email;
+    }
 
     /**
      * @param string $email
      */
-    public function setEmail($email) {
-		$this->email = $email;
-	}
-
-}
\ No newline at end of file
+    public function setEmail($email)
+    {
+        $this->email = $email;
+    }
+}
diff --git a/DataMapper/UserMapper.php b/DataMapper/UserMapper.php
index c7ee69f..0b6b689 100644
--- a/DataMapper/UserMapper.php
+++ b/DataMapper/UserMapper.php
@@ -25,12 +25,14 @@ namespace DesignPatterns\DataMapper;
  */
 class UserMapper
 {
-
     /**
      * @var DBAL
      */
     protected $adapter;
 
+    /**
+     * @param DBAL $dbLayer
+     */
     public function __construct(DBAL $dbLayer)
     {
         $this->adapter = $dbLayer;
@@ -40,6 +42,7 @@ class UserMapper
      * saves a user object from memory to Database
      *
      * @param User $user
+     *
      * @return boolean
      */
     public function save(User $user)
@@ -55,9 +58,11 @@ class UserMapper
         if (null === ($id = $user->getUserId())) {
             unset($data['userid']);
             $this->adapter->insert($data);
+
             return true;
         } else {
             $this->adapter->update($data, array('userid = ?' => $id));
+
             return true;
         }
     }
@@ -66,13 +71,15 @@ class UserMapper
      * finds a user from Database based on ID and returns a User object located
      * in memory
      *
-     * @param $id
+     * @param int $id
+     *
      * @throws \InvalidArgumentException
      * @return User
      */
     public function findById($id)
     {
         $result = $this->adapter->find($id);
+
         if (0 == count($result)) {
             throw new \InvalidArgumentException("User #$id not found");
         }
@@ -104,7 +111,7 @@ class UserMapper
      *
      * @param array $row
      *
-     * @return \DesignPatterns\DataMapper\User
+     * @return User
      */
     protected function mapObject(array $row)
     {
diff --git a/Decorator/Decorator.php b/Decorator/Decorator.php
index 74d526d..88c1b84 100644
--- a/Decorator/Decorator.php
+++ b/Decorator/Decorator.php
@@ -16,24 +16,25 @@ namespace DesignPatterns\Decorator;
  */
 
 /**
- * the Deoorator MUST implement the Renderer contract, this is the key-feature
+ * the Deoorator MUST implement the RendererInterface contract, this is the key-feature
  * of this design pattern. If not, this is no longer a Decorator but just a dumb
  * wrapper.
  */
-abstract class Decorator implements Renderer
+abstract class Decorator implements RendererInterface
 {
-
-    protected $_wrapped;
+    /**
+     * @var RendererInterface
+     */
+    protected $wrapped;
 
     /**
      * You must type-hint the wrapped component :
      * It ensures you can call renderData() in the subclasses !
      * 
-     * @param Renderer $wrappable
+     * @param RendererInterface $wrappable
      */
-    public function __construct(Renderer $wrappable)
+    public function __construct(RendererInterface $wrappable)
     {
-        $this->_wrapped = $wrappable;
+        $this->wrapped = $wrappable;
     }
 }
-
diff --git a/Decorator/RenderInJson.php b/Decorator/RenderInJson.php
index 0c521bd..0edc7ea 100644
--- a/Decorator/RenderInJson.php
+++ b/Decorator/RenderInJson.php
@@ -2,13 +2,20 @@
 
 namespace DesignPatterns\Decorator;
 
+/**
+ * Class RenderInJson
+ */
 class RenderInJson extends Decorator
 {
-
+    /**
+     * render data as JSON
+     *
+     * @return mixed|string
+     */
     public function renderData()
     {
-        $output = $this->_wrapped->renderData();
+        $output = $this->wrapped->renderData();
+
         return json_encode($output);
     }
-
 }
diff --git a/Decorator/RenderInXml.php b/Decorator/RenderInXml.php
index 599c2f5..5967b98 100644
--- a/Decorator/RenderInXml.php
+++ b/Decorator/RenderInXml.php
@@ -2,19 +2,28 @@
 
 namespace DesignPatterns\Decorator;
 
+/**
+ * Class RenderInXml
+ */
 class RenderInXml extends Decorator
 {
-
+    /**
+     * render data as XML
+     *
+     * @return mixed|string
+     */
     public function renderData()
     {
-        $output = $this->_wrapped->renderData();
-        // do some fany conversion to xml from array ...
+        $output = $this->wrapped->renderData();
+
+        // do some fancy conversion to xml from array ...
+
         $doc = new \DOMDocument();
+
         foreach ($output as $key => $val) {
             $doc->appendChild($doc->createElement('foo', 'bar'));
         }
 
         return $doc->saveXML();
     }
-
 }
diff --git a/Decorator/Renderer.php b/Decorator/Renderer.php
deleted file mode 100644
index af3c46b..0000000
--- a/Decorator/Renderer.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace DesignPatterns\Decorator;
-
-interface Renderer
-{
-
-    public function renderData();
-}
diff --git a/Decorator/RendererInterface.php b/Decorator/RendererInterface.php
new file mode 100644
index 0000000..f5f3e3f
--- /dev/null
+++ b/Decorator/RendererInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DesignPatterns\Decorator;
+
+/**
+ * Class RendererInterface
+ */
+interface RendererInterface
+{
+    /**
+     * render data
+     *
+     * @return mixed
+     */
+    public function renderData();
+}
diff --git a/Decorator/Webservice.php b/Decorator/Webservice.php
index 1075341..a23f42c 100644
--- a/Decorator/Webservice.php
+++ b/Decorator/Webservice.php
@@ -2,19 +2,29 @@
 
 namespace DesignPatterns\Decorator;
 
-class Webservice implements Renderer
+/**
+ * Class Webservice
+ */
+class Webservice implements RendererInterface
 {
+    /**
+     * @var mixed
+     */
+    protected $data;
 
-    protected $_data;
-
+    /**
+     * @param mixed $data
+     */
     public function __construct($data)
     {
-        $this->_data = $data;
+        $this->data = $data;
     }
 
+    /**
+     * @return string
+     */
     public function renderData()
     {
-        return $this->_data;
+        return $this->data;
     }
-
 }
diff --git a/DependencyInjection/DependencyInjection.php b/DependencyInjection/Configuration.php
similarity index 57%
rename from DependencyInjection/DependencyInjection.php
rename to DependencyInjection/Configuration.php
index e4693e9..f972bb6 100644
--- a/DependencyInjection/DependencyInjection.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns;
+namespace DesignPatterns\DependencyInjection;
 
 /**
  * Dependency Injection
@@ -18,15 +18,20 @@ namespace DesignPatterns;
  */
 class Configuration
 {
-    protected $_host;
+    /**
+     * @var string
+     */
+    protected $host;
 
     /**
      * @param string $host
+     *
      * @return Configuration
      */
     public function setHost($host)
     {
-        $this->_host = $host;
+        $this->host = $host;
+
         return $this; // for a fluent interface
     }
 
@@ -35,29 +40,6 @@ class Configuration
      */
     public function getHost()
     {
-        return $this->_host;
-    }
-}
-
-class Connection
-{
-    protected $_configuration;
-
-    /**
-     * here, Configuration gets injected and Connection will get all that it needs from Configuration
-     * without DI, the configuration would be created directly in Connection, which is not very good
-     * for testing and extending Connection
-     *
-     * @param Configuration $config
-     */
-    public function __construct(Configuration $config)
-    {
-        $this->_configuration = $config;
-    }
-
-    public function connect()
-    {
-        $host = $this->_configuration->getHost();
-        // ...
+        return $this->host;
     }
 }
diff --git a/DependencyInjection/Connection.php b/DependencyInjection/Connection.php
new file mode 100644
index 0000000..02ff81b
--- /dev/null
+++ b/DependencyInjection/Connection.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace DesignPatterns\DependencyInjection;
+
+/**
+ * Class Connection
+ */
+class Connection
+{
+    /**
+     * @var Configuration
+     */
+    protected $configuration;
+
+    /**
+     * here, Configuration gets injected and Connection will get all that it needs from Configuration
+     * without DI, the configuration would be created directly in Connection, which is not very good
+     * for testing and extending Connection
+     *
+     * @param Configuration $config
+     */
+    public function __construct(Configuration $config)
+    {
+        $this->configuration = $config;
+    }
+
+    /**
+     * connection using the injected config
+     */
+    public function connect()
+    {
+        $host = $this->configuration->getHost();
+        // ...
+    }
+}
diff --git a/Facade/BiosInterface.php b/Facade/BiosInterface.php
new file mode 100644
index 0000000..377651c
--- /dev/null
+++ b/Facade/BiosInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace DesignPatterns\Facade;
+
+/**
+ * Class BiosInterface
+ */
+interface BiosInterface
+{
+    /**
+     * execute the BIOS
+     */
+    public function execute();
+
+    /**
+     * wait for halt
+     */
+    public function waitForKeyPress();
+
+    /**
+     * launches the OS
+     *
+     * @param OsInterface $os
+     */
+    public function launch(OsInterface $os);
+
+    /**
+     * power down BIOS
+     */
+    public function powerDown();
+}
diff --git a/Facade/Facade.php b/Facade/Facade.php
index 5dda3b0..82fbab4 100644
--- a/Facade/Facade.php
+++ b/Facade/Facade.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Facade;
 
 /**
@@ -28,31 +24,45 @@ namespace DesignPatterns\Facade;
  */
 class Facade
 {
+    /**
+     * @var OsInterface
+     */
+    protected $os;
 
-    protected $opsys;
+    /**
+     * @var BiosInterface
+     */
     protected $bios;
 
     /**
      * This is the perfect time to use a dependency injection container
      * to creaate an instance of this class
+     *
+     * @param BiosInterface $bios
+     * @param OsInterface   $os
      */
     public function __construct(BiosInterface $bios, OsInterface $os)
     {
         $this->bios = $bios;
-        $this->opsys = $os;
+        $this->os = $os;
     }
 
+    /**
+     * turn on the system
+     */
     public function turnOn()
     {
         $this->bios->execute();
         $this->bios->waitForKeyPress();
-        $this->bios->launch($this->opsys);
+        $this->bios->launch($this->os);
     }
 
+    /**
+     * turn off the system
+     */
     public function turnOff()
     {
-        $this->opsys->halt();
+        $this->os->halt();
         $this->bios->powerDown();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Facade/OsInterface.php b/Facade/OsInterface.php
new file mode 100644
index 0000000..e81c7f1
--- /dev/null
+++ b/Facade/OsInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace DesignPatterns\Facade;
+
+/**
+ * Class OsInterface
+ */
+interface OsInterface
+{
+    /**
+     * halt the OS
+     */
+    public function halt();
+}
diff --git a/FactoryMethod/Bicycle.php b/FactoryMethod/Bicycle.php
index 772dcdf..76b4a53 100644
--- a/FactoryMethod/Bicycle.php
+++ b/FactoryMethod/Bicycle.php
@@ -1,20 +1,24 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
  * Bicycle is a bicycle
  */
-class Bicycle implements Vehicle
+class Bicycle implements VehicleInterface
 {
+    /**
+     * @var string
+     */
+    protected $color;
 
+    /**
+     * sets the color of the bicycle
+     *
+     * @param string $rgb
+     */
     public function setColor($rgb)
     {
-        
+        $this->color = $rgb;
     }
-
-}
\ No newline at end of file
+}
diff --git a/FactoryMethod/FactoryMethod.php b/FactoryMethod/FactoryMethod.php
index 3402bd6..72357d5 100644
--- a/FactoryMethod/FactoryMethod.php
+++ b/FactoryMethod/FactoryMethod.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -32,7 +28,7 @@ abstract class FactoryMethod
      * 
      * @param string $type a generic type
      * 
-     * @return Vehicle a new vehicle
+     * @return VehicleInterface a new vehicle
      */
     abstract protected function createVehicle($type);
 
@@ -41,7 +37,7 @@ abstract class FactoryMethod
      * 
      * @param int $type
      * 
-     * @return Vehicle a new vehicle
+     * @return VehicleInterface a new vehicle
      */
     public function create($type)
     {
@@ -50,5 +46,4 @@ abstract class FactoryMethod
 
         return $obj;
     }
-
-}
\ No newline at end of file
+}
diff --git a/FactoryMethod/Ferrari.php b/FactoryMethod/Ferrari.php
index f57d728..f221e42 100644
--- a/FactoryMethod/Ferrari.php
+++ b/FactoryMethod/Ferrari.php
@@ -1,20 +1,22 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
  * Ferrari is a italian car
  */
-class Ferrari implements Vehicle
+class Ferrari implements VehicleInterface
 {
+    /**
+     * @var string
+     */
+    protected $color;
 
+    /**
+     * @param string $rgb
+     */
     public function setColor($rgb)
     {
-        
+        $this->color = $rgb;
     }
-
-}
\ No newline at end of file
+}
diff --git a/FactoryMethod/GermanFactory.php b/FactoryMethod/GermanFactory.php
index a962c76..36e7f04 100644
--- a/FactoryMethod/GermanFactory.php
+++ b/FactoryMethod/GermanFactory.php
@@ -1,39 +1,31 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
- * GermanFactory is vehicle factory in Germany
+ * GermanFactory is a vehicle factory in Germany
  */
 class GermanFactory extends FactoryMethod
 {
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function createVehicle($type)
     {
         switch ($type) {
-
-            case parent::CHEAP :
+            case parent::CHEAP:
                 return new Bicycle();
                 break;
-
-            case parent::FAST :
+            case parent::FAST:
                 $obj = new Porsche();
                 // we can specialize the way we want some concrete Vehicle since
                 // we know the class
                 $obj->addTuningAMG();
+
                 return $obj;
                 break;
-
-            default :
+            default:
                 throw new \InvalidArgumentException("$type is not a valid vehicle");
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/FactoryMethod/ItalianFactory.php b/FactoryMethod/ItalianFactory.php
index db8514c..17a1233 100644
--- a/FactoryMethod/ItalianFactory.php
+++ b/FactoryMethod/ItalianFactory.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -11,25 +7,20 @@ namespace DesignPatterns\FactoryMethod;
  */
 class ItalianFactory extends FactoryMethod
 {
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected function createVehicle($type)
     {
         switch ($type) {
-
-            case parent::CHEAP :
+            case parent::CHEAP:
                 return new Bicycle();
                 break;
-
-            case parent::FAST :
+            case parent::FAST:
                 return new Ferrari();
                 break;
-
-            default :
+            default:
                 throw new \InvalidArgumentException("$type is not a valid vehicle");
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/FactoryMethod/Porsche.php b/FactoryMethod/Porsche.php
index c2e775b..f4824fe 100644
--- a/FactoryMethod/Porsche.php
+++ b/FactoryMethod/Porsche.php
@@ -1,25 +1,31 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
  * Porsche is a german car
  */
-class Porsche implements Vehicle
+class Porsche implements VehicleInterface
 {
+    /**
+     * @var string
+     */
+    protected $color;
 
+    /**
+     * @param string $rgb
+     */
     public function setColor($rgb)
     {
-        
+        $this->color = $rgb;
     }
 
+    /**
+     * although tuning by AMG is only offered for Mercedes Cars,
+     * this is a valid coding example ...
+     */
     public function addTuningAMG()
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/FactoryMethod/Vehicle.php b/FactoryMethod/Vehicle.php
deleted file mode 100644
index 180a349..0000000
--- a/FactoryMethod/Vehicle.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\FactoryMethod;
-
-/**
- * Vehicle is a contract for a vehicle
- */
-interface Vehicle
-{
-
-    function setColor($rgb);
-}
\ No newline at end of file
diff --git a/FactoryMethod/VehicleInterface.php b/FactoryMethod/VehicleInterface.php
new file mode 100644
index 0000000..5f6d756
--- /dev/null
+++ b/FactoryMethod/VehicleInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DesignPatterns\FactoryMethod;
+
+/**
+ * VehicleInterface is a contract for a vehicle
+ */
+interface VehicleInterface
+{
+    /**
+     * sets the color of the vehicle
+     *
+     * @param string $rgb
+     */
+    public function setColor($rgb);
+}
diff --git a/FluentInterface/SQL.php b/FluentInterface/SQL.php
index 84034da..6074f70 100644
--- a/FluentInterface/SQL.php
+++ b/FluentInterface/SQL.php
@@ -11,56 +11,78 @@ namespace DesignPatterns\FluentInterface;
  * Examples:
  * - Doctrine2's QueryBuilder works something like that example class below
  * - PHPUnit uses fluent interfaces to build mock objects
- * - Yii Framework: CDbCommand and CActiveRecord use this pattern too
- *
+ * - Yii Framework: CDbCommand and CActiveRecord use this pattern, too
  */
 class SQL
 {
-    protected $_fields = array();
-    protected $_from = array();
-    protected $_where = array();
+    /**
+     * @var array
+     */
+    protected $fields = array();
 
     /**
+     * @var array
+     */
+    protected $from = array();
+
+    /**
+     * @var array
+     */
+    protected $where = array();
+
+    /**
+     * adds select fields
      *
      * @param array $fields
+     *
      * @return SQL
      */
     public function select(array $fields = array())
     {
-        $this->_fields = $fields;
+        $this->fields = $fields;
+
         return $this;
     }
 
     /**
+     * adds a FROM clause
      *
      * @param string $table
      * @param string $alias
+     *
      * @return SQL
      */
     public function from($table, $alias)
     {
-        $this->_from[] = $table . ' AS ' . $alias;
+        $this->from[] = $table . ' AS ' . $alias;
+
         return $this;
     }
 
     /**
+     * adds a WHERE condition
+     *
      * @param string $condition
+     *
      * @return SQL
      */
     public function where($condition)
     {
-        $this->_where[] = $condition;
+        $this->where[] = $condition;
+
         return $this;
     }
-    
+
     /**
      * Gets the query, just an example of building a query, 
      * no check on consistency
+     *
+     * @return string
      */
     public function getQuery()
     {
-        return 'SELECT ' . implode(',', $this->_fields) 
-                . ' FROM ' . implode(',', $this->_from)
-                . ' WHERE ' . implode(' AND ', $this->_where);
+        return 'SELECT ' . implode(',', $this->fields)
+                . ' FROM ' . implode(',', $this->from)
+                . ' WHERE ' . implode(' AND ', $this->where);
     }
 }
diff --git a/Iterator/CardGame.php b/Iterator/CardGame.php
deleted file mode 100644
index f6dd081..0000000
--- a/Iterator/CardGame.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\Iterator;
-
-/**
- * Iterator provides a standard way to iterate over a collection without knowing
- * how it is implemented. All you need to know is : you can traverse it
- * with current, valid, next, rewind and key.
- * 
- * That's the key feature of this pattern :
- * The underlaying machinery could be an array, a matrix, a file, a cursor
- * from database, a webservice with a cache, you don't care anymore.
- * 
- * Note: This design pattern changes from one language to another. It depends 
- * mostly how loop statements handle collections (see Java before and after 1.5)
- * 
- * In this simple example, I try to demonstrate how I manage a "linear" iterator
- * on a card game but in fact, the underlaying storage is handled by two combined
- * arrays.
- * 
- * If tomorrow you decide to read cards from a database, the client 
- * (see the PHPUnit test) will remain unchanged. That's the beauty of it.
- */
-class CardGame implements \Iterator
-{
-
-    protected $color = array('D', 'S', 'C', 'H');
-    protected $number = array(7, 8, 9, 10, 'J', 'Q', 'K', 'A');
-
-    /**
-     * Return the current value
-     */
-    public function current()
-    {
-        return current($this->number) . ' of ' . current($this->color);
-    }
-
-    /**
-     * Return the current key
-     */
-    public function key()
-    {
-        return current($this->color) . current($this->number);
-    }
-
-    /**
-     * Go to the next item in the collection
-     */
-    public function next()
-    {
-        if (false === next($this->number)) {
-            if (false !== next($this->color)) {
-                reset($this->number);
-            }
-        }
-    }
-
-    /**
-     * Go to the first item in the collection
-     */
-    public function rewind()
-    {
-        reset($this->color);
-        reset($this->number);
-    }
-
-    /**
-     * Is the current position a valid item (true) 
-     * or do we reach the end (false) ?
-     */
-    public function valid()
-    {
-        return current($this->number) || current($this->color);
-    }
-
-}
\ No newline at end of file
diff --git a/Iterator/File.php b/Iterator/File.php
new file mode 100644
index 0000000..0e1aa3d
--- /dev/null
+++ b/Iterator/File.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace DesignPatterns\Iterator;
+
+/**
+ * iterator pattern
+ *
+ * Purpose:
+ * to make an object iterable
+ *
+ * Examples:
+ * - to process a file line by line by just running over all lines (which have an object representation) for a file
+ *   (which of course is an object, too)
+ *
+ * Note:
+ * Standard PHP Library (SPL) defines an interface Iterator which is best suited for this!
+ * Often you would want to implement the Countable interface too, to allow count($object) on your iterable object
+ *
+ * THIS EXAMPLE ALSO APPLIES THE COMPOSITE PATTERN
+ *
+ */
+class File
+{
+    /**
+     * @var RowSet
+     */
+    protected $rowSet;
+
+    /**
+     * @var string
+     */
+    protected $pathName;
+
+    /**
+     * @param string $pathName
+     */
+    public function __construct($pathName)
+    {
+        $this->rowSet = new Rowset($this);
+    }
+
+    /**
+     * processes the rowSet
+     */
+    public function process()
+    {
+        // this is the place to show how using an iterator, with foreach
+        // See the CardGame.php file
+        $this->rowSet->process();
+    }
+}
diff --git a/Iterator/Iterator.php b/Iterator/Iterator.php
deleted file mode 100644
index e218412..0000000
--- a/Iterator/Iterator.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace DesignPatterns;
-
-/**
- * iterator pattern
- *
- * Purpose:
- * to make an object iterable
- *
- * Examples:
- * - to process a file line by line by just running over all lines (which have an object representation) for a file
- *   (which of course is an object, too)
- *
- * Note:
- * Standard PHP Library (SPL) defines an interface Iterator which is best suited for this!
- * Often you would want to implement the Countable interface too, to allow count($object) on your iterable object
- *
- * THIS EXAMPLE ALSO APPLIES THE COMPOSITE PATTERN
- *
- */
-class File
-{
-    protected $_rowset;
-
-    protected $_pathName;
-
-    public function __construct($pathName)
-    {
-        $this->_rowset = new Rowset($this);
-    }
-
-    public function process()
-    {
-        // this is the place to show how using an iterator, with foreach
-        // See the CardGame.php file
-        $this->_rowset->process();
-    }
-}
-
-class Rowset implements \Iterator
-{
-    protected $_currentRow;
-
-    protected $_file;
-
-    public function __construct($file)
-    {
-        $this->_file = $file;
-    }
-
-    /**
-     * composite pattern: run through all rows and process them
-     *
-     * @return void
-     */
-    public function process()
-    {
-        // this actually calls rewind(), { next(), valid(), key() and current() :}
-        /**
-         * THE key feature of the Iterator Pattern is to provide a *public contract*
-         * to iterate on a collection without knowing how items are handled inside
-         * the collection. It is not just an easy way to use "foreach"
-         * 
-         * One cannot see the point of iterator pattern if you iterate on $this.
-         * This example is unclear and mixed with some Composite pattern ideas. 
-         */
-        foreach ($this as $line => $row) {
-            $row->process();
-        }
-    }
-
-    public function rewind()
-    {
-        // seek to first line from $this->_file
-    }
-
-    public function next()
-    {
-        // read the next line from $this->_file
-        if (!$eof) {
-            $data = ''; // get the line
-            $this->_currentRow = new Row($data);
-        } else {
-            $this->_currentRow = null;
-        }
-    }
-
-    public function current()
-    {
-        return $this->_currentRow;
-    }
-
-    public function valid()
-    {
-        return null !== $this->_currentRow;
-    }
-
-    public function key()
-    {
-        // you would want to increment this in next() or whatsoever
-        return $this->_lineNumber;
-    }
-}
-
-class Row
-{
-    protected $_data;
-
-    public function __construct($data)
-    {
-        $this->_data = $data;
-    }
-
-    public function process()
-    {
-        // do some fancy things here ...
-    }
-}
diff --git a/Iterator/Row.php b/Iterator/Row.php
new file mode 100644
index 0000000..df4002d
--- /dev/null
+++ b/Iterator/Row.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace DesignPatterns\Iterator;
+
+/**
+ * Class Row
+ */
+class Row
+{
+    protected $data;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process()
+    {
+        // do some fancy things here ...
+    }
+}
diff --git a/Iterator/RowSet.php b/Iterator/RowSet.php
new file mode 100644
index 0000000..f1ef5d7
--- /dev/null
+++ b/Iterator/RowSet.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace DesignPatterns\Iterator;
+
+/**
+ * Class RowSet
+ */
+class RowSet implements \Iterator
+{
+    /**
+     * @var
+     */
+    protected $currentRow;
+
+    /**
+     * @var string
+     */
+    protected $file;
+
+    /**
+     * @var int
+     */
+    protected $lineNumber;
+
+    /**
+     * @param string $file
+     */
+    public function __construct($file)
+    {
+        $this->file = $file;
+    }
+
+    /**
+     * composite pattern: run through all rows and process them
+     *
+     * @return void
+     */
+    public function process()
+    {
+        // this actually calls rewind(), { next(), valid(), key() and current() :}
+        /**
+         * THE key feature of the Iterator Pattern is to provide a *public contract*
+         * to iterate on a collection without knowing how items are handled inside
+         * the collection. It is not just an easy way to use "foreach"
+         *
+         * One cannot see the point of iterator pattern if you iterate on $this.
+         * This example is unclear and mixed with some Composite pattern ideas.
+         */
+        foreach ($this as $line => $row) {
+            $row->process();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        // seek to first line from $this->file
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function next()
+    {
+        // read the next line from $this->file
+        if (!$eof) {
+            $data = ''; // get the line
+            $this->currentRow = new Row($data);
+        } else {
+            $this->currentRow = null;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function current()
+    {
+        return $this->currentRow;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function valid()
+    {
+        return null !== $this->currentRow;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function key()
+    {
+        // you would want to increment this in next() or whatsoever
+        return $this->lineNumber;
+    }
+}
diff --git a/Mediator/Colleague.php b/Mediator/Colleague.php
index e410e86..c6aae18 100644
--- a/Mediator/Colleague.php
+++ b/Mediator/Colleague.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator;
 
 /**
@@ -12,8 +8,11 @@ namespace DesignPatterns\Mediator;
  */
 abstract class Colleague
 {
-
-    // this ensures no change in subclasses
+    /**
+     * this ensures no change in subclasses
+     *
+     * @var MediatorInterface
+     */
     private $mediator;
 
     // for subclasses
@@ -22,10 +21,12 @@ abstract class Colleague
         return $this->mediator;
     }
 
+    /**
+     * @param MediatorInterface $medium
+     */
     public function __construct(MediatorInterface $medium)
     {
         // in this way, we are sure the concrete colleague knows the mediator
         $this->mediator = $medium;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Mediator/Mediator.php b/Mediator/Mediator.php
index 98b34a1..9a9c3f1 100644
--- a/Mediator/Mediator.php
+++ b/Mediator/Mediator.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator;
 
 use DesignPatterns\Mediator\Subsystem;
@@ -29,6 +25,11 @@ class Mediator implements MediatorInterface
     protected $database;
     protected $client;
 
+    /**
+     * @param Subsystem\Database $db
+     * @param Subsystem\Client   $cl
+     * @param Subsystem\Server   $srv
+     */
     public function setColleague(Subsystem\Database $db, Subsystem\Client $cl, Subsystem\Server $srv)
     {
         $this->database = $db;
@@ -36,19 +37,31 @@ class Mediator implements MediatorInterface
         $this->client = $cl;
     }
 
+    /**
+     * make request
+     */
     public function makeRequest()
     {
         $this->server->process();
     }
 
+    /**
+     * query db
+     *
+     * @return mixed
+     */
     public function queryDb()
     {
         return $this->database->getData();
     }
 
+    /**
+     * send response
+     *
+     * @param string $content
+     */
     public function sendResponse($content)
     {
         $this->client->output($content);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Mediator/MediatorInterface.php b/Mediator/MediatorInterface.php
index 019ad4e..d7e6a41 100644
--- a/Mediator/MediatorInterface.php
+++ b/Mediator/MediatorInterface.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator;
 
 /**
@@ -12,10 +8,20 @@ namespace DesignPatterns\Mediator;
  */
 interface MediatorInterface
 {
+    /**
+     * sends the response
+     *
+     * @param string $content
+     */
+    public function sendResponse($content);
 
-    function sendResponse($content);
+    /**
+     * makes a request
+     */
+    public function makeRequest();
 
-    function makeRequest();
-
-    function queryDb();
-}
\ No newline at end of file
+    /**
+     * queries the DB
+     */
+    public function queryDb();
+}
diff --git a/Mediator/Subsystem/Client.php b/Mediator/Subsystem/Client.php
index c4b082a..ef00aa0 100644
--- a/Mediator/Subsystem/Client.php
+++ b/Mediator/Subsystem/Client.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator\Subsystem;
 
 use DesignPatterns\Mediator\Colleague;
@@ -13,15 +9,21 @@ use DesignPatterns\Mediator\Colleague;
  */
 class Client extends Colleague
 {
-
+    /**
+     * request
+     */
     public function request()
     {
         $this->getMediator()->makeRequest();
     }
 
+    /**
+     * output content
+     *
+     * @param string $content
+     */
     public function output($content)
     {
         echo $content;
     }
-
-}
\ No newline at end of file
+}
diff --git a/Mediator/Subsystem/Database.php b/Mediator/Subsystem/Database.php
index dd7bb01..80acf28 100644
--- a/Mediator/Subsystem/Database.php
+++ b/Mediator/Subsystem/Database.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator\Subsystem;
 
 use DesignPatterns\Mediator\Colleague;
@@ -13,10 +9,11 @@ use DesignPatterns\Mediator\Colleague;
  */
 class Database extends Colleague
 {
-
+    /**
+     * @return string
+     */
     public function getData()
     {
         return "World";
     }
-
-}
\ No newline at end of file
+}
diff --git a/Mediator/Subsystem/Server.php b/Mediator/Subsystem/Server.php
index 2f30c57..34b7400 100644
--- a/Mediator/Subsystem/Server.php
+++ b/Mediator/Subsystem/Server.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Mediator\Subsystem;
 
 use DesignPatterns\Mediator\Colleague;
@@ -13,11 +9,12 @@ use DesignPatterns\Mediator\Colleague;
  */
 class Server extends Colleague
 {
-
+    /**
+     * process on server
+     */
     public function process()
     {
         $data = $this->getMediator()->queryDb();
         $this->getMediator()->sendResponse("Hello $data");
     }
-
-}
\ No newline at end of file
+}
diff --git a/Multiton/Multiton.php b/Multiton/Multiton.php
index 74f9dcd..1dddebb 100644
--- a/Multiton/Multiton.php
+++ b/Multiton/Multiton.php
@@ -37,7 +37,7 @@ class Multiton
      *
      * @var array
      */
-    private static $_instances = array();
+    private static $instances = array();
 
     /**
      * should not be called from outside: private!
@@ -53,15 +53,16 @@ class Multiton
      * uses lazy initialization
      * 
      * @param string $instanceName
+     *
      * @return Multiton
      */
     public static function getInstance($instanceName)
     {
-        if ( ! array_key_exists($instanceName, self::$_instances)) {
-            self::$_instances[$instanceName] = new self();
+        if (!array_key_exists($instanceName, self::$instances)) {
+            self::$instances[$instanceName] = new self();
         }
 
-        return self::$_instances[$instanceName];
+        return self::$instances[$instanceName];
     }
 
     /**
diff --git a/NullObject/LoggerInterface.php b/NullObject/LoggerInterface.php
index 2cb19d0..9acf855 100644
--- a/NullObject/LoggerInterface.php
+++ b/NullObject/LoggerInterface.php
@@ -1,18 +1,18 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\NullObject;
 
 /**
  * LoggerInterface is a contract for logging something
  * 
- * Key-feaature : NullLogger MUST inherit from this interface like any other Loggers
+ * Key feature: NullLogger MUST inherit from this interface like any other Loggers
  */
 interface LoggerInterface
 {
-
+    /**
+     * @param string $str
+     *
+     * @return mixed
+     */
     public function log($str);
-}
\ No newline at end of file
+}
diff --git a/NullObject/NullLogger.php b/NullObject/NullLogger.php
index 761f0d9..aafa327 100644
--- a/NullObject/NullLogger.php
+++ b/NullObject/NullLogger.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\NullObject;
 
 /**
@@ -32,10 +28,11 @@ namespace DesignPatterns\NullObject;
  */
 class NullLogger implements LoggerInterface
 {
-
+    /**
+     * @param string $str
+     */
     public function log($str)
     {
         // do nothing
     }
-
-}
\ No newline at end of file
+}
diff --git a/NullObject/PrintLogger.php b/NullObject/PrintLogger.php
index 4640ca4..67df5ad 100644
--- a/NullObject/PrintLogger.php
+++ b/NullObject/PrintLogger.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\NullObject;
 
 /**
@@ -11,10 +7,11 @@ namespace DesignPatterns\NullObject;
  */
 class PrintLogger implements LoggerInterface
 {
-
+    /**
+     * @param string $str
+     */
     public function log($str)
     {
         echo $str;
     }
-
-}
\ No newline at end of file
+}
diff --git a/NullObject/Service.php b/NullObject/Service.php
index f1eaf33..df46e34 100644
--- a/NullObject/Service.php
+++ b/NullObject/Service.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\NullObject;
 
 /**
@@ -11,20 +7,28 @@ namespace DesignPatterns\NullObject;
  */
 class Service
 {
-
+    /**
+     * @var LoggerInterface
+     */
     protected $logger;
 
-    // we inject the logger in ctor and it is mandatory
+    /**
+     * we inject the logger in ctor and it is mandatory
+     *
+     * @param LoggerInterface $log
+     */
     public function __construct(LoggerInterface $log)
     {
         $this->logger = $log;
     }
 
+    /**
+     * do something ...
+     */
     public function doSomething()
     {
         // no more check "if (!is_null($this->logger))..." with the NullObject pattern
         $this->logger->log('We are in ' . __METHOD__);
         // something to do...
     }
-
-}
\ No newline at end of file
+}
diff --git a/Observer/User.php b/Observer/User.php
index 3b41867..3ee3fba 100644
--- a/Observer/User.php
+++ b/Observer/User.php
@@ -10,49 +10,57 @@ namespace DesignPatterns\Observer;
  */
 class User implements \SplSubject
 {
-
-    protected $_data = array();
-
     /**
+     * user data
+     *
      * @var array
      */
-    protected $_observers = array();
+    protected $data = array();
+
+    /**
+     * observers
+     *
+     * @var array
+     */
+    protected $observers = array();
 
     /**
      * attach a new observer
      *
      * @param \SplObserver $observer
+     *
      * @return void
      */
     public function attach(\SplObserver $observer)
     {
-        $this->_observers[] = $observer;
+        $this->observers[] = $observer;
     }
 
     /**
      * detach an observer
      *
      * @param \SplObserver $observer
+     *
      * @return void
      */
     public function detach(\SplObserver $observer)
     {
-        $index = array_search($observer, $this->_observers);
+        $index = array_search($observer, $this->observers);
 
         if (false !== $index) {
-            unset($this->_observers[$index]);
+            unset($this->observers[$index]);
         }
     }
 
     /**
-     *
+     * notify observers
      *
      * @return void
      */
     public function notify()
     {
         /** @var SplObserver $observer */
-        foreach ($this->_observers as $observer) {
+        foreach ($this->observers as $observer) {
             $observer->update($this);
         }
     }
@@ -61,17 +69,16 @@ class User implements \SplSubject
      * Ideally one would better write setter/getter for all valid attributes and only call notify()
      * on attributes that matter when changed
      *
-     * @param $name
-     * @param $value
+     * @param string $name
+     * @param mixed  $value
+     *
      * @return void
      */
     public function __set($name, $value)
     {
-        $this->_data[$name] = $value;
+        $this->data[$name] = $value;
 
         // notify the observers, that user has been updated
         $this->notify();
     }
-
 }
-
diff --git a/Observer/UserObserver.php b/Observer/UserObserver.php
index 3cb8b9a..549da20 100644
--- a/Observer/UserObserver.php
+++ b/Observer/UserObserver.php
@@ -17,7 +17,6 @@ namespace DesignPatterns\Observer;
  */
 class UserObserver implements \SplObserver
 {
-
     /**
      * This is the only method to implement as an observer.
      * It is called by the Subject (usually by SplSubject::notify() )
@@ -28,5 +27,4 @@ class UserObserver implements \SplObserver
     {
         echo get_class($subject) . ' has been updated';
     }
-
 }
diff --git a/Prototype/BarBookPrototype.php b/Prototype/BarBookPrototype.php
new file mode 100644
index 0000000..c254496
--- /dev/null
+++ b/Prototype/BarBookPrototype.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace DesignPatterns\Prototype;
+
+/**
+ * Class BarBookPrototype
+ */
+class BarBookPrototype extends BookPrototype
+{
+    /**
+     * @var string
+     */
+    protected $category = 'Bar';
+
+    /**
+     * empty clone
+     */
+    public function __clone()
+    {
+
+    }
+}
diff --git a/Prototype/BookPrototype.php b/Prototype/BookPrototype.php
new file mode 100644
index 0000000..c75795e
--- /dev/null
+++ b/Prototype/BookPrototype.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace DesignPatterns\Prototype;
+
+/**
+ * Prototype pattern
+ *
+ * Purpose:
+ * to avoid the cost of creating objects the standard way (new Foo()) and instead create a prototype and clone it
+ *
+ * Examples:
+ * - Large amounts of data (e.g. create 1,000,000 rows in a database at once via a ORM)
+ *
+ */
+abstract class BookPrototype
+{
+    /**
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * @var string
+     */
+    protected $category;
+
+    /**
+     * @abstract
+     * @return void
+     */
+    abstract public function __clone();
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+}
diff --git a/Prototype/FooBookPrototype.php b/Prototype/FooBookPrototype.php
new file mode 100644
index 0000000..ed2f250
--- /dev/null
+++ b/Prototype/FooBookPrototype.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace DesignPatterns\Prototype;
+
+/**
+ * Class FooBookPrototype
+ */
+class FooBookPrototype extends BookPrototype
+{
+    protected $category = 'Foo';
+
+    /**
+     * empty clone
+     */
+    public function __clone()
+    {
+
+    }
+}
diff --git a/Prototype/Prototype.php b/Prototype/Prototype.php
deleted file mode 100644
index ba94e13..0000000
--- a/Prototype/Prototype.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace DesignPatterns;
-
-/**
- * Prototype pattern
- *
- * Purpose:
- * to avoid the cost of creating objects the standard way (new Foo()) and instead create a prototype and clone it
- *
- * Examples:
- * - Large amounts of data (e.g. create 1,000,000 rows in a database at once via a ORM)
- *
- */
-abstract class BookPrototype
-{
-    protected $_title;
-    protected $_category;
-
-    /**
-     * @abstract
-     * @return void
-     */
-    abstract public function __clone();
-
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    public function setTitle($title)
-    {
-        $this->_title = $title;
-    }
-}
-
-class FooBookPrototype extends BookPrototype
-{
-    protected $_category = 'Foo';
-
-    public function __clone()
-    {
-        
-    }
-}
-
-class BarBookPrototype extends BookPrototype
-{
-    protected $_category = 'Bar';
-
-
-    public function __clone()
-    {
-        
-    }
-}
-
-$fooPrototype = new FooBookPrototype();
-$barPrototype = new BarBookPrototype();
-
-// now lets say we need 10,000 books of foo and 5,000 of bar ...
-for ($i = 0; $i < 10000; $i++) {
-    $book = clone $fooPrototype;
-    $book->setTitle('Foo Book No ' . $i);
-}
diff --git a/Prototype/index.php b/Prototype/index.php
new file mode 100644
index 0000000..70e2ac1
--- /dev/null
+++ b/Prototype/index.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace DesignPatterns\Prototype;
+
+$fooPrototype = new FooBookPrototype();
+$barPrototype = new BarBookPrototype();
+
+// now lets say we need 10,000 books of foo and 5,000 of bar ...
+for ($i = 0; $i < 10000; $i++) {
+    $book = clone $fooPrototype;
+    $book->setTitle('Foo Book No ' . $i);
+}
diff --git a/Proxy/Proxy.php b/Proxy/Proxy.php
deleted file mode 100644
index f035e1f..0000000
--- a/Proxy/Proxy.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace DesignPatterns;
-
-/**
- * Proxy pattern
- *
- * Purpose:
- * to interface to anything that is expensive or impossible to duplicate
- *
- * Examples:
- * - Doctrine2 uses proxies to implement framework magic (e.g. Lazy initialization) in them, while the user still works
- *   with his own entity classes and will never use nor touch the proxies
- *
- */
-class Record
-{
-    protected $_data;
-
-    public function __construct($data = null)
-    {
-        $this->_data = $data;
-    }
-
-    /**
-     * magic setter
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->_data[(string) $name] = $value;
-    }
-
-    /**
-     * magic getter
-     *
-     * @param string $name
-     * @return mixed|null
-     */
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[(string) $name];
-        } else {
-            return null;
-        }
-    }
-}
-
-class RecordProxy extends Record
-{
-    /**
-     * @var bool
-     */
-    protected $_isDirty = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isInitialized = false;
-
-    /**
-     * @param array
-     */
-    public function __construct($data)
-    {
-        parent::__construct($data);
-
-        // when the record has data, mark it as initialized
-        // since Record will hold our business logic, we don't want to
-        // implement this behaviour there, but instead in a new proxy class
-        // that extends the Record class
-        if (null !== $data) {
-            $this->_isInitialized = true;
-            $this->_isDirty = true;
-        }
-    }
-
-    /**
-     * magic setter
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->_isDirty = true;
-        parent::__set($name, $value);
-    }
-}
diff --git a/Proxy/Record.php b/Proxy/Record.php
new file mode 100644
index 0000000..722d946
--- /dev/null
+++ b/Proxy/Record.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace DesignPatterns\Proxy;
+
+/**
+ * Proxy pattern
+ *
+ * Purpose:
+ * to interface to anything that is expensive or impossible to duplicate
+ *
+ * Examples:
+ * - Doctrine2 uses proxies to implement framework magic (e.g. lazy initialization) in them, while the user still works
+ *   with his own entity classes and will never use nor touch the proxies
+ *
+ */
+class Record
+{
+    /**
+     * @var array|null
+     */
+    protected $data;
+
+    /**
+     * @param null $data
+     */
+    public function __construct($data = null)
+    {
+        $this->data = (array) $data;
+    }
+
+    /**
+     * magic setter
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return void
+     */
+    public function __set($name, $value)
+    {
+        $this->data[(string) $name] = $value;
+    }
+
+    /**
+     * magic getter
+     *
+     * @param string $name
+     *
+     * @return mixed|null
+     */
+    public function __get($name)
+    {
+        if (array_key_exists($name, $this->data)) {
+            return $this->data[(string) $name];
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/Proxy/RecordProxy.php b/Proxy/RecordProxy.php
new file mode 100644
index 0000000..63f7904
--- /dev/null
+++ b/Proxy/RecordProxy.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace DesignPatterns\Proxy;
+
+/**
+ * Class RecordProxy
+ */
+class RecordProxy extends Record
+{
+    /**
+     * @var bool
+     */
+    protected $isDirty = false;
+
+    /**
+     * @var bool
+     */
+    protected $isInitialized = false;
+
+    /**
+     * @param array $data
+     */
+    public function __construct($data)
+    {
+        parent::__construct($data);
+
+        // when the record has data, mark it as initialized
+        // since Record will hold our business logic, we don't want to
+        // implement this behaviour there, but instead in a new proxy class
+        // that extends the Record class
+        if (null !== $data) {
+            $this->isInitialized = true;
+            $this->isDirty = true;
+        }
+    }
+
+    /**
+     * magic setter
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return void
+     */
+    public function __set($name, $value)
+    {
+        $this->isDirty = true;
+        parent::__set($name, $value);
+    }
+}
diff --git a/README.md b/README.md
index bb90373..09d628a 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ The patterns can be structured in roughly three different categories. Please cli
 ## Contribute
 
 Please feel free to fork and extend existing or add your own examples and send a pull request with your changes!
+To establish a consistent code quality, please check your code using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) against [this standard](https://github.com/domnikl/Symfony2-coding-standard).
 
 ## License
 
diff --git a/Registry/Registry.php b/Registry/Registry.php
index ea96491..020398a 100644
--- a/Registry/Registry.php
+++ b/Registry/Registry.php
@@ -14,39 +14,41 @@ namespace DesignPatterns;
  * - Yii Framework: CWebApplication holds all the application components, such as CWebUser, CUrlManager, etc.
  *
  */
-
 abstract class Registry
 {
     const LOGGER = 'logger';
 
-    protected static $_storedValues;
+    /**
+     * @var array
+     */
+    protected static $storedValues = array();
 
     /**
-     * @static
+     * sets a value
+     *
      * @param string $key
-     * @param mixed $value
+     * @param mixed  $value
+     *
+     * @static
      * @return void
      */
     public static function set($key, $value)
     {
-        self::$_storedValues[$key] = $value;
+        self::$storedValues[$key] = $value;
     }
 
     /**
-     * @static
+     * gets a value from the registry
+     *
      * @param string $key
+     *
+     * @static
      * @return mixed
      */
     public static function get($key)
     {
-        return self::$_storedValues[$key];
+        return self::$storedValues[$key];
     }
 
     // typically there would be methods to check if a key has already been registered and so on ...
 }
-
-// while bootstraping the application
-Registry::set(Registry::LOGGER, new \StdClass());
-
-// throughout the application
-Registry::get(Registry::LOGGER)->log('foo');
\ No newline at end of file
diff --git a/Registry/index.php b/Registry/index.php
new file mode 100644
index 0000000..0a20047
--- /dev/null
+++ b/Registry/index.php
@@ -0,0 +1,9 @@
+<?php
+
+use DesignPatterns\Registry;
+
+// while bootstrapping the application
+Registry::set(Registry::LOGGER, new \StdClass());
+
+// throughout the application
+Registry::get(Registry::LOGGER)->log('foo');
diff --git a/SimpleFactory/Bicycle.php b/SimpleFactory/Bicycle.php
index 39c2d32..fbe605d 100644
--- a/SimpleFactory/Bicycle.php
+++ b/SimpleFactory/Bicycle.php
@@ -1,20 +1,19 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\SimpleFactory;
 
 /**
  * Bicycle is a bicycle
  */
-class Bicycle implements Vehicle
+class Bicycle implements VehicleInterface
 {
-
+    /**
+     * @param mixed $destination
+     *
+     * @return mixed|void
+     */
     public function driveTo($destination)
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/SimpleFactory/ConcreteFactory.php b/SimpleFactory/ConcreteFactory.php
index 01ba1ad..2890da6 100644
--- a/SimpleFactory/ConcreteFactory.php
+++ b/SimpleFactory/ConcreteFactory.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\SimpleFactory;
 
 /**
@@ -17,7 +13,9 @@ namespace DesignPatterns\SimpleFactory;
  */
 class ConcreteFactory
 {
-
+    /**
+     * @var array
+     */
     protected $typeList;
 
     /**
@@ -36,7 +34,8 @@ class ConcreteFactory
      * Creates a vehicle
      * 
      * @param string $type a known type key
-     * @return Vehicle a new instance of Vehicle
+     *
+     * @return VehicleInterface a new instance of VehicleInterface
      * @throws \InvalidArgumentException
      */
     public function createVehicle($type)
@@ -48,5 +47,4 @@ class ConcreteFactory
 
         return new $className();
     }
-
-}
\ No newline at end of file
+}
diff --git a/SimpleFactory/Scooter.php b/SimpleFactory/Scooter.php
index 925d7d2..2e386b7 100644
--- a/SimpleFactory/Scooter.php
+++ b/SimpleFactory/Scooter.php
@@ -1,20 +1,17 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\SimpleFactory;
 
 /**
  * Scooter is a Scooter
  */
-class Scooter implements Vehicle
+class Scooter implements VehicleInterface
 {
-
+    /**
+     * @param mixed $destination
+     */
     public function driveTo($destination)
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/SimpleFactory/Vehicle.php b/SimpleFactory/Vehicle.php
deleted file mode 100644
index 87b0ef3..0000000
--- a/SimpleFactory/Vehicle.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\SimpleFactory;
-
-/**
- * Vehicle is a contract for a vehicle
- */
-interface Vehicle
-{
-
-    function driveTo($destination);
-}
\ No newline at end of file
diff --git a/SimpleFactory/VehicleInterface.php b/SimpleFactory/VehicleInterface.php
new file mode 100644
index 0000000..66dc3fd
--- /dev/null
+++ b/SimpleFactory/VehicleInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DesignPatterns\SimpleFactory;
+
+/**
+ * VehicleInterface is a contract for a vehicle
+ */
+interface VehicleInterface
+{
+    /**
+     * @param mixed $destination
+     *
+     * @return mixed
+     */
+    public function driveTo($destination);
+}
diff --git a/Singleton/Singleton.php b/Singleton/Singleton.php
index 3a42582..e47579a 100644
--- a/Singleton/Singleton.php
+++ b/Singleton/Singleton.php
@@ -40,7 +40,9 @@ class Singleton
      *
      */
     private function __construct()
-    {}
+    {
+
+    }
 
     /**
      * prevent the instance from being cloned
@@ -48,7 +50,9 @@ class Singleton
      * @return void
      */
     private function __clone()
-    {}
+    {
+
+    }
 
     /**
      * prevent from being unserialized
@@ -56,5 +60,7 @@ class Singleton
      * @return void
      */
     private function __wakeup()
-    {}
+    {
+
+    }
 }
diff --git a/State/CreateOrder.php b/State/CreateOrder.php
new file mode 100644
index 0000000..eb494cc
--- /dev/null
+++ b/State/CreateOrder.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class CreateOrder
+ */
+class CreateOrder implements OrderInterface
+{
+    /**
+     * @var array
+     */
+    private $order;
+
+    /**
+     * @param array $order
+     *
+     * @throws \Exception
+     */
+    public function __construct(array $order)
+    {
+        if (empty($order)) {
+            throw new \Exception('Order can not be empty!');
+        }
+        $this->order = $order;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function shipOrder()
+    {
+        $this->order['status'] = 'shipping';
+        $this->order['updatedTime'] = time();
+
+        // Setting the new order status into database;
+        return $this->updateOrder($order);
+    }
+
+    /**
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function completeOrder()
+    {
+        //Can not complete the order which status is created, throw exception;
+        throw new \Exception('Can not complete the order which status is created!');
+    }
+}
diff --git a/State/OrderController.php b/State/OrderController.php
new file mode 100644
index 0000000..a9690b4
--- /dev/null
+++ b/State/OrderController.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderController
+ */
+class OrderController
+{
+    /**
+     * @param int $id
+     */
+    public function shipAction($id)
+    {
+        $order = OrderFactory::getOrder($id);
+        try {
+            $order->shipOrder($id);
+        } catch (Exception $e) {
+            //handle error!
+        }
+        // response to browser
+    }
+
+    /**
+     * @param int $id
+     */
+    public function completeAction($id)
+    {
+        $order = OrderFactory::getOrder($id);
+        try {
+            $order->completeOrder($id);
+        } catch (Exception $e) {
+            //handle error!
+        }
+        // response to browser
+    }
+}
diff --git a/State/OrderFactory.php b/State/OrderFactory.php
new file mode 100644
index 0000000..0e61758
--- /dev/null
+++ b/State/OrderFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderFactory
+ */
+class OrderFactory
+{
+    private function __construct()
+    {
+        throw Exception('Can not instance the OrderFactory class!');
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return CreateOrder|ShippingOrder
+     * @throws \Exception
+     */
+    public static function getOrder($id)
+    {
+        $order = 'Get Order From Database';
+
+        switch ($order['status']) {
+            case 'created':
+                return new CreateOrder($order);
+            case 'shipping':
+                return new ShippingOrder($order);
+            default:
+                throw new \Exception('Order status error!');
+                break;
+        }
+    }
+}
diff --git a/State/OrderInterface.php b/State/OrderInterface.php
new file mode 100644
index 0000000..35c92e4
--- /dev/null
+++ b/State/OrderInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class OrderInterface
+ */
+interface OrderInterface
+{
+    /**
+     * @return mixed
+     */
+    public function shipOrder();
+
+    /**
+     * @return mixed
+     */
+    public function completeOrder();
+}
diff --git a/State/ShippingOrder.php b/State/ShippingOrder.php
new file mode 100644
index 0000000..cbd8f93
--- /dev/null
+++ b/State/ShippingOrder.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace DesignPatterns\Status;
+
+/**
+ * Class ShippingOrder
+ */
+class ShippingOrder implements OrderInterface
+{
+    /**
+     * @var array
+     */
+    private $order;
+
+    /**
+     * @param array $order
+     *
+     * @throws \Exception
+     */
+    public function __construct(array $order)
+    {
+        if (empty($order)) {
+            throw new \Exception('Order can not be empty!');
+        }
+        $this->order = $order;
+    }
+
+    /**
+     * @return mixed|void
+     * @throws \Exception
+     */
+    public function shipOrder()
+    {
+        //Can not ship the order which status is shipping, throw exception;
+        throw new \Exception('Can not ship the order which status is shipping!');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function completeOrder()
+    {
+        $this->order['status'] = 'completed';
+        $this->order['updatedTime'] = time();
+
+        // Setting the new order status into database;
+        return $this->updateOrder($order);
+    }
+}
diff --git a/StaticFactory/FormatNumber.php b/StaticFactory/FormatNumber.php
index f7bf851..8b20db2 100644
--- a/StaticFactory/FormatNumber.php
+++ b/StaticFactory/FormatNumber.php
@@ -2,7 +2,10 @@
 
 namespace DesignPatterns\StaticFactory;
 
-class FormatNumber implements Formatter
+/**
+ * Class FormatNumber
+ */
+class FormatNumber implements FormatterInterface
 {
-    
+
 }
diff --git a/StaticFactory/FormatString.php b/StaticFactory/FormatString.php
index 9f961e7..9f48fde 100644
--- a/StaticFactory/FormatString.php
+++ b/StaticFactory/FormatString.php
@@ -2,7 +2,10 @@
 
 namespace DesignPatterns\StaticFactory;
 
-class FormatString implements Formatter
+/**
+ * Class FormatString
+ */
+class FormatString implements FormatterInterface
 {
-    
+
 }
diff --git a/StaticFactory/Formatter.php b/StaticFactory/Formatter.php
deleted file mode 100644
index 54b0ba0..0000000
--- a/StaticFactory/Formatter.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace DesignPatterns\StaticFactory;
-
-interface Formatter
-{
-    
-}
diff --git a/StaticFactory/FormatterInterface.php b/StaticFactory/FormatterInterface.php
new file mode 100644
index 0000000..b5220cd
--- /dev/null
+++ b/StaticFactory/FormatterInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DesignPatterns\StaticFactory;
+
+/**
+ * Class FormatterInterface
+ */
+interface FormatterInterface
+{
+
+}
diff --git a/StaticFactory/StaticFactory.php b/StaticFactory/StaticFactory.php
index aa32d43..f31d4a1 100644
--- a/StaticFactory/StaticFactory.php
+++ b/StaticFactory/StaticFactory.php
@@ -14,16 +14,19 @@ namespace DesignPatterns\StaticFactory;
  * - Zend Framework: Zend_Cache_Backend or _Frontend use a factory method create cache backends or frontends
  * 
  * Note1: Remember, static => global => evil
- * Note2: Cannot be subclassed or mock-uped or have multiple different instances
+ * Note2: Cannot be subclassed or mock-upped or have multiple different instances
  */
 class StaticFactory
 {
-
     /**
      * the parametrized function to get create an instance
      *
+     * @param string $type
+     *
      * @static
-     * @return Formatter
+     *
+     * @throws \InvalidArgumentException
+     * @return FormatterInterface
      */
     public static function factory($type)
     {
@@ -35,5 +38,4 @@ class StaticFactory
 
         return new $className();
     }
-
 }
diff --git a/StatusPattern/StatusPattern.php b/StatusPattern/StatusPattern.php
deleted file mode 100644
index 92d2585..0000000
--- a/StatusPattern/StatusPattern.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-namespace DesignPatterns;
-
-
-/**
-* The order has two status: created, shipping, completed.
-* When the order's status is created, what can do is just 'shipping' handle;
-* When the order's status is shipping, what can do is just 'completed' handle;
-* 
-*/
-interface OrderInterface 
-{
-
-	public function shipOrder();
-
-	public function completeOrder();
-
-}
-
-class CreateOrder implements OrderInterface
-{
-
-	private $order;
-
-	public function __construct(array $order)
-	{
-		if (empty($order)) {
-			throw new \Exception('Order can not be empty!');
-		}
-		$this->order = $order;
-	}
-
-	public function shipOrder()
-	{
-		$this->order['status'] = 'shipping';
-		$this->order['updatedTime'] = time();
-		// Setting the new order status into database;
-		return $this->updateOrder($order);
-	}
-
-	public function completeOrder()
-	{
-		//Can not complete the order which status is created, throw exception;
-		throw new \Exception('Can not complete the order which status is created!');
-	}
-}
-
-class ShippingOrder implements OrderInterface
-{
-
-	private $order;
-
-	public function __construct(array $order)
-	{
-		if (empty($order)) {
-			throw new \Exception('Order can not be empty!');
-		}
-		$this->order = $order;
-	}
-
-	public function shipOrder()
-	{
-		//Can not ship the order which status is shipping, throw exception;
-		throw new \Exception('Can not ship the order which status is shipping!');
-	}
-
-	public function completeOrder()
-	{
-		$this->order['status'] = 'completed';
-		$this->order['updatedTime'] = time();
-		// Setting the new order status into database;
-		return $this->updateOrder($order);
-	}
-}
-
-
-class OrderFactory {
-
-	public static function getOrder($id)
-	{
-		$order = 'Get Order From Database';
-
-		switch ($order['status']) {
-			case 'created':
-				return new CreateOrder($order);
-			case 'shipping':
-				return new ShippingOrder($order);
-			default:
-				throw new \Exception('Order status error!');
-				break;
-		}
-	}
-
-	private function __construct()
-	{
-		throw Exception('Can not instance the OrderFactory class!');
-	}
-}
-
-
-// Client
-
-Class OrderControler {
-
-	public function shipAction($id)
-	{
-		$order = OrderFactory::getOrder($id);
-		try {
-			$order->shipOrder($id);
-		} catch (Exception $e) {
-			//handle error!
-		}
-		// response to browser 
-	}
-
-	public function completeAction($id)
-	{
-		$order = OrderFactory::getOrder($id);
-		try {
-			$order->completeOrder($id);
-		} catch (Exception $e) {
-			//handle error!
-		}
-		// response to browser 
-	}
-
-}
diff --git a/Strategy/ComparatorInterface.php b/Strategy/ComparatorInterface.php
new file mode 100644
index 0000000..468a614
--- /dev/null
+++ b/Strategy/ComparatorInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DesignPatterns\Strategy;
+
+/**
+ * Class ComparatorInterface
+ */
+interface ComparatorInterface
+{
+    /**
+     * @param mixed $a
+     * @param mixed $b
+     *
+     * @return bool
+     */
+    public function compare($a, $b);
+}
diff --git a/Strategy/DateComparator.php b/Strategy/DateComparator.php
new file mode 100644
index 0000000..9025acc
--- /dev/null
+++ b/Strategy/DateComparator.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace DesignPatterns\Strategy;
+
+/**
+ * Class DateComparator
+ */
+class DateComparator implements ComparatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function compare($a, $b)
+    {
+        $aDate = strtotime($a['date']);
+        $bDate = strtotime($b['date']);
+
+        if ($aDate == $bDate) {
+            return 0;
+        } else {
+            return $aDate < $bDate ? -1 : 1;
+        }
+    }
+}
diff --git a/Strategy/IdComparator.php b/Strategy/IdComparator.php
new file mode 100644
index 0000000..c3bc9a7
--- /dev/null
+++ b/Strategy/IdComparator.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace DesignPatterns\Strategy;
+
+/**
+ * Class IdComparator
+ */
+class IdComparator implements ComparatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function compare($a, $b)
+    {
+        if ($a['id'] == $b['id']) {
+            return 0;
+        } else {
+            return $a['id'] < $b['id'] ? -1 : 1;
+        }
+    }
+}
diff --git a/Strategy/ObjectCollection.php b/Strategy/ObjectCollection.php
new file mode 100644
index 0000000..682a8d0
--- /dev/null
+++ b/Strategy/ObjectCollection.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace DesignPatterns\Strategy;
+
+/**
+ * Class ObjectCollection
+ */
+class ObjectCollection
+{
+    /**
+     * @var array
+     */
+    private $elements;
+
+    /**
+     * @var ComparatorInterface
+     */
+    private $comparator;
+
+    /**
+     * @param array $elements
+     */
+    public function __construct(array $elements = array())
+    {
+        $this->elements = $elements;
+    }
+
+    /**
+     * @return array
+     */
+    public function sort()
+    {
+        $callback = array($this->comparator, 'compare');
+        uasort($this->elements, $callback);
+
+        return $this->elements;
+    }
+
+    /**
+     * @param ComparatorInterface $comparator
+     *
+     * @return void
+     */
+    public function setComparator(ComparatorInterface $comparator)
+    {
+        $this->comparator = $comparator;
+    }
+}
diff --git a/Strategy/Strategy.php b/Strategy/Strategy.php
deleted file mode 100644
index 45187b7..0000000
--- a/Strategy/Strategy.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace DesignPatterns;
-
-/**
- * strategy pattern
- *
- * Terminology:
- * - Context
- * - Strategy
- * - Concrete Strategy
- *
- * Purpose:
- * to separate strategies and to enable fast switching between them.
- * also this pattern is a good alternative to inheritance (instead of having an abstract class that is extended)
- *
- * Examples:
- * - sorting a list of objects, one strategy by date, the other by id
- * - simplify unit testing: e.g. switching between file and in-memory storage
- *
- */
-
-interface Comparator
-{
-    /**
-     * @abstract
-     * @param object $a
-     * @param object $b
-     * @return bool
-     */
-    public function compare($a, $b);
-}
-
-class ObjectCollection
-{
-    private $_elements;
-    private $_comparator;
-
-    /**
-     * @param array $elements
-     */
-    public function __construct(array $elements = array())
-    {
-        $this->_elements = $elements;
-    }
-
-    /**
-     * @return array
-     */
-    public function sort()
-    {
-        $callback = array($this->_comparator, 'compare');
-        uasort($this->_elements, $callback);
-
-        return $this->_elements;
-    }
-
-    /**
-     * @param Comparator $comparator
-     * @return void
-     */
-    public function setComparator(Comparator $comparator)
-    {
-        $this->_comparator = $comparator;
-    }
-}
-
-class IdComparator implements Comparator
-{
-    public function compare($a, $b)
-    {
-        if ($a['id'] == $b['id']) {
-            return 0;
-        } else {
-            return $a['id'] < $b['id'] ? -1 : 1;
-        }
-    }
-}
-
-class DateComparator implements Comparator
-{
-    public function compare($a, $b)
-    {
-        $aDate = strtotime($a['date']);
-        $bDate = strtotime($b['date']);
-
-        if ($aDate == $bDate) {
-            return 0;
-        } else {
-            return $aDate < $bDate ? -1 : 1;
-        }
-    }
-}
-
-$elements = array(
-    array(
-        'id' => 2,
-        'date' => '2011-01-01',
-    ),
-    array(
-        'id' => 1,
-        'date' => '2011-02-01'
-    )
-);
-
-$collection = new ObjectCollection($elements);
-$collection->setComparator(new IdComparator());
-$collection->sort();
-
-$collection->setComparator(new DateComparator());
-$collection->sort();
\ No newline at end of file
diff --git a/Strategy/index.php b/Strategy/index.php
new file mode 100644
index 0000000..d59819a
--- /dev/null
+++ b/Strategy/index.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace DesignPatterns\Strategy;
+
+/**
+ * strategy pattern
+ *
+ * Terminology:
+ * - Context
+ * - Strategy
+ * - Concrete Strategy
+ *
+ * Purpose:
+ * to separate strategies and to enable fast switching between them.
+ * also this pattern is a good alternative to inheritance (instead of having an abstract class that is extended)
+ *
+ * Examples:
+ * - sorting a list of objects, one strategy by date, the other by id
+ * - simplify unit testing: e.g. switching between file and in-memory storage
+ *
+ */
+
+$elements = array(
+    array(
+        'id' => 2,
+        'date' => '2011-01-01',
+    ),
+    array(
+        'id' => 1,
+        'date' => '2011-02-01'
+    )
+);
+
+$collection = new ObjectCollection($elements);
+$collection->setComparator(new IdComparator());
+$collection->sort();
+
+$collection->setComparator(new DateComparator());
+$collection->sort();
diff --git a/TemplateMethod/BeachJourney.php b/TemplateMethod/BeachJourney.php
index cec7bab..6370ef2 100644
--- a/TemplateMethod/BeachJourney.php
+++ b/TemplateMethod/BeachJourney.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\TemplateMethod;
 
 /**
@@ -11,10 +7,11 @@ namespace DesignPatterns\TemplateMethod;
  */
 class BeachJourney extends Journey
 {
-
+    /**
+     * prints what to do to enjoy your vacation
+     */
     protected function enjoyVacation()
     {
         echo "Swimming and sun-bathing\n";
     }
-
-}
\ No newline at end of file
+}
diff --git a/TemplateMethod/CityJouney.php b/TemplateMethod/CityJourney.php
similarity index 52%
rename from TemplateMethod/CityJouney.php
rename to TemplateMethod/CityJourney.php
index 30e834a..e29e4ba 100644
--- a/TemplateMethod/CityJouney.php
+++ b/TemplateMethod/CityJourney.php
@@ -1,20 +1,17 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\TemplateMethod;
 
 /**
- * CityJouney is a journey in a city
+ * CityJourney is a journey in a city
  */
-class CityJouney extends Journey
+class CityJourney extends Journey
 {
-
+    /**
+     * prints what to do in your journey to enjoy vacation
+     */
     protected function enjoyVacation()
     {
         echo "Eat, drink, take photos and sleep\n";
     }
-
-}
\ No newline at end of file
+}
diff --git a/TemplateMethod/Journey.php b/TemplateMethod/Journey.php
index ce93b82..5255b97 100644
--- a/TemplateMethod/Journey.php
+++ b/TemplateMethod/Journey.php
@@ -1,15 +1,11 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\TemplateMethod;
 
 /**
  * Template Method is a behavioral design pattern.
  * 
- * Perhaps you have encoutered it many times already. The idea is to let subclasses
+ * Perhaps you have encountered it many times already. The idea is to let subclasses
  * of this abstract template "finish" the behavior of an algorithm.
  * 
  * A.k.a the "Hollywood principle" : "" Don't call us, we call you. ""
@@ -25,14 +21,13 @@ namespace DesignPatterns\TemplateMethod;
  */
 abstract class Journey
 {
-
     /**
      * This is the public service provided by this class and its subclasses.
      * Notice it is final to "freeze" the global behavior of algorithm.
      * If you want to override this contract, make an interface with only takeATrip() 
      * and subclass it.
      */
-    public final function takeATrip()
+    final public function takeATrip()
     {
         $this->buyAFlight();
         $this->takePlane();
@@ -53,24 +48,27 @@ abstract class Journey
      */
     protected function buyGift()
     {
-        
     }
 
-    // this method will be unknown by subclasses (better)    
+    /**
+     * this method will be unknown by subclasses (better)
+     */
     private function buyAFlight()
     {
         echo "Buying a flight\n";
     }
 
-    // sbclasses will get access to this method but cannot override it and 
-    // compromise this algorithm (warning : cause of cyclic depedencies)
+    /**
+     * sbclasses will get access to this method but cannot override it and
+     * compromise this algorithm (warning : cause of cyclic dependencies)
+     */
     final protected function takePlane()
     {
         echo "Taking the plane\n";
     }
 
     // A note regarding the keyword "final" : don't use it when you start coding :
-    // add it after you narrow and know exacly what change and what remain unchanged
-    // in this algorithm. 
+    // add it after you narrow and know exactly what change and what remain unchanged
+    // in this algorithm.
     // [abstract] x [3 access] x [final] = 12 combinations, it can be hard !
-}
\ No newline at end of file
+}
diff --git a/Tests/AbstractFactory/AbstractFactoryTest.php b/Tests/AbstractFactory/AbstractFactoryTest.php
index 81d0401..581c068 100644
--- a/Tests/AbstractFactory/AbstractFactoryTest.php
+++ b/Tests/AbstractFactory/AbstractFactoryTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\AbstractFactory;
 
 use DesignPatterns\AbstractFactory\AbstractFactory;
@@ -15,7 +11,6 @@ use DesignPatterns\AbstractFactory\JsonFactory;
  */
 class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function getFactories()
     {
         return array(
@@ -39,12 +34,11 @@ class AbstractFactoryTest extends \PHPUnit_Framework_TestCase
             $factory->createText('footnotes')
         );
 
-        $this->assertContainsOnly('DesignPatterns\AbstractFactory\Media', $article);
+        $this->assertContainsOnly('DesignPatterns\AbstractFactory\MediaInterface', $article);
+
         /* this is the time to look at the Builder pattern. This pattern
          * helps you to create complex object like that article above with
          * a given Abstract Factory
          */
-        
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Adapter/AdapterTest.php b/Tests/Adapter/AdapterTest.php
index 9dda0eb..370a6c3 100644
--- a/Tests/Adapter/AdapterTest.php
+++ b/Tests/Adapter/AdapterTest.php
@@ -1,12 +1,8 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Adapter;
 
-use DesignPatterns\Adapter\ElecBookAdapter;
+use DesignPatterns\Adapter\EBookAdapter;
 use DesignPatterns\Adapter\Kindle;
 use DesignPatterns\Adapter\PaperBookInterface;
 use DesignPatterns\Adapter\Book;
@@ -17,20 +13,24 @@ use DesignPatterns\Adapter\Book;
  */
 class AdapterTest extends \PHPUnit_Framework_TestCase
 {
-
+    /**
+     * @return array
+     */
     public function getBook()
     {
         return array(
             array(new Book()),
             // we build a "wrapped" electronic book in the adapter
-            array(new ElecBookAdapter(new Kindle()))
+            array(new EBookAdapter(new Kindle()))
         );
     }
 
     /**
      * This client only knows paper book but surprise, surprise, the second book
-     * is in fact an electronic book.
-     * 
+     * is in fact an electronic book, but both work the same way
+     *
+     * @param PaperBookInterface $book
+     *
      * @dataProvider getBook
      */
     public function test_I_am_an_old_Client(PaperBookInterface $book)
@@ -38,5 +38,4 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
         $book->open();
         $book->turnPage();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Builder/DirectorTest.php b/Tests/Builder/DirectorTest.php
index 83e2234..381cb0f 100644
--- a/Tests/Builder/DirectorTest.php
+++ b/Tests/Builder/DirectorTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Builder;
 
 use DesignPatterns\Builder\Director;
@@ -37,10 +33,9 @@ class DirectorTest extends \PHPUnit_Framework_TestCase
      * 
      * @dataProvider getBuilder
      */
-    public function testBuild(\DesignPatterns\Builder\Builder $builder)
+    public function testBuild(\DesignPatterns\Builder\BuilderInterface $builder)
     {
         $newVehicle = $this->director->build($builder);
         $this->assertInstanceOf('DesignPatterns\Builder\Parts\Vehicle', $newVehicle);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/ChainOfResponsibilities/ChainTest.php b/Tests/ChainOfResponsibilities/ChainTest.php
index 337559b..e4ab54c 100644
--- a/Tests/ChainOfResponsibilities/ChainTest.php
+++ b/Tests/ChainOfResponsibilities/ChainTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\ChainOfResponsibilities;
 
 use DesignPatterns\ChainOfResponsibilities\Request;
@@ -74,5 +70,4 @@ class ChainTest extends \PHPUnit_Framework_TestCase
         // the last rsponsible :
         $this->assertEquals('DesignPatterns\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Command/CommandTest.php b/Tests/Command/CommandTest.php
index 0df7f9e..7400139 100644
--- a/Tests/Command/CommandTest.php
+++ b/Tests/Command/CommandTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Command;
 
 use DesignPatterns\Command\Invoker;
@@ -32,5 +28,4 @@ class CommandTest extends \PHPUnit_Framework_TestCase
         $this->expectOutputString('Hello World');
         $this->invoker->run();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Composite/FormTest.php b/Tests/Composite/FormTest.php
index 41cf904..8a2aae3 100644
--- a/Tests/Composite/FormTest.php
+++ b/Tests/Composite/FormTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Test\Composite;
 
 use DesignPatterns\Composite;
@@ -35,5 +31,4 @@ class FormTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertTrue(is_subclass_of('DesignPatterns\Composite\Form', 'DesignPatterns\Composite\FormElement'));
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/DataMapper/UserMapperTest.php b/Tests/DataMapper/UserMapperTest.php
index 2bce7b6..bd2d1c1 100644
--- a/Tests/DataMapper/UserMapperTest.php
+++ b/Tests/DataMapper/UserMapperTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Test\DataMapper;
 
 use DesignPatterns\DataMapper\UserMapper;
@@ -106,5 +102,4 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
 
         $user = $this->mapper->findById(404);
     }
-
 }
diff --git a/Tests/Decorator/DecoratorTest.php b/Tests/Decorator/DecoratorTest.php
index fce9e56..c6202dd 100644
--- a/Tests/Decorator/DecoratorTest.php
+++ b/Tests/Decorator/DecoratorTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Decorator;
 
 use DesignPatterns\Decorator;
@@ -42,7 +38,7 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorMustImplementsRenderer()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\Renderer'));
+        $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\RendererInterface'));
     }
 
     /**
@@ -60,9 +56,8 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testDecoratorOnlyAcceptRenderer()
     {
-        $mock = $this->getMock('DesignPatterns\Decorator\Renderer');
+        $mock = $this->getMock('DesignPatterns\Decorator\RendererInterface');
         $dec = $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array($mock));
         $this->assertNotNull($dec);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Facade/FacadeTest.php b/Tests/Facade/FacadeTest.php
index 868ed32..0d91521 100644
--- a/Tests/Facade/FacadeTest.php
+++ b/Tests/Facade/FacadeTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Facade;
 
 use DesignPatterns\Facade\Facade as Computer;
@@ -46,5 +42,4 @@ class FacadeTest extends \PHPUnit_Framework_TestCase
         // but I can access to lower component
         $this->assertEquals('Linux', $os->getName());
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/FactoryMethod/FactoryMethodTest.php b/Tests/FactoryMethod/FactoryMethodTest.php
index 463c1c8..0796a98 100644
--- a/Tests/FactoryMethod/FactoryMethodTest.php
+++ b/Tests/FactoryMethod/FactoryMethodTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\FactoryMethod;
 
 use DesignPatterns\FactoryMethod\FactoryMethod;
@@ -38,7 +34,7 @@ class FactoryMethodTest extends \PHPUnit_Framework_TestCase
         // about the factory, all we know is it can produce vehicle
         foreach ($this->type as $oneType) {
             $vehicle = $shop->create($oneType);
-            $this->assertInstanceOf('DesignPatterns\FactoryMethod\Vehicle', $vehicle);
+            $this->assertInstanceOf('DesignPatterns\FactoryMethod\VehicleInterface', $vehicle);
         }
     }
 
@@ -51,5 +47,4 @@ class FactoryMethodTest extends \PHPUnit_Framework_TestCase
     {
         $shop->create('spaceship');
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/FluentInterface/FluentInterfaceTest.php b/Tests/FluentInterface/FluentInterfaceTest.php
index 7dec8d8..63be030 100644
--- a/Tests/FluentInterface/FluentInterfaceTest.php
+++ b/Tests/FluentInterface/FluentInterfaceTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\FluentInterface;
 
 use DesignPatterns\FluentInterface\SQL;
@@ -24,5 +20,4 @@ class FluentInterfaceTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals('SELECT foo,bar FROM foobar AS f WHERE f.bar = ?', $query);
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Iterator/IteratorTest.php b/Tests/Iterator/IteratorTest.php
deleted file mode 100644
index de2e2b2..0000000
--- a/Tests/Iterator/IteratorTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\Tests\Iterator;
-
-use DesignPatterns\Iterator\CardGame;
-
-/**
- * IteratorTest tests the CardGame iterator
- */
-class IteratorTest extends \PHPUnit_Framework_TestCase
-{
-
-    protected $deck;
-
-    protected function setUp()
-    {
-        $this->deck = new CardGame();
-    }
-
-    /**
-     * This is the client of the iterator.
-     * It remains unchanged even if one day I decide to use MongoDB to store the
-     * card.
-     */
-    public function testCardinal()
-    {
-        $counter = 0;
-        foreach ($this->deck as $key => $card) {
-            $counter++;
-        }
-
-        $this->assertEquals(32, $counter);
-    }
-
-    /**
-     * Some fancy functions of PHP.
-     */
-    public function testExampleOf_PHP_Helper()
-    {
-        // PHPUnit works on array or iterator :
-        $this->assertCount(32, $this->deck);
-        // a easy way to get an array from interator :
-        $cards = iterator_to_array($this->deck);
-        $this->assertEquals('A of S', $cards['SA']);
-        // a easy way to get an iterator from an array :
-        $iterator = new \ArrayIterator($cards);
-        $this->assertInstanceOf('\Iterator', $iterator);
-    }
-
-    /**
-     * Iterator can be combine, chained, filter, there are many in the SPL
-     * and sadly they are rarely used.
-     */
-    public function testIteratorCombining()
-    {
-        // a fancy way to add a joker to the deck :
-        $joker = array('JK' => 'Joker');
-        $newDeck = new \AppendIterator();
-        $newDeck->append($this->deck);
-        $newDeck->append(new \ArrayIterator($joker));
-        $this->assertCount(33, $newDeck);
-    }
-
-}
\ No newline at end of file
diff --git a/Tests/Mediator/MediatorTest.php b/Tests/Mediator/MediatorTest.php
index f4f689d..77db09f 100644
--- a/Tests/Mediator/MediatorTest.php
+++ b/Tests/Mediator/MediatorTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Mediator;
 
 use DesignPatterns\Mediator\Mediator;
@@ -35,5 +31,4 @@ class MediatorTest extends \PHPUnit_Framework_TestCase
         // Anyway, it remains complexity in the Mediator that's why the pattern
         // Observer is preferable in mnay situations.
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/NullObject/LoggerTest.php b/Tests/NullObject/LoggerTest.php
index 36edb6b..d19e144 100644
--- a/Tests/NullObject/LoggerTest.php
+++ b/Tests/NullObject/LoggerTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\NullObject;
 
 use DesignPatterns\NullObject\NullLogger;
@@ -31,5 +27,4 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
         $this->expectOutputString('We are in DesignPatterns\NullObject\Service::doSomething');
         $service->doSomething();
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/Observer/ObserverTest.php b/Tests/Observer/ObserverTest.php
index 7c12bc8..9508ac9 100644
--- a/Tests/Observer/ObserverTest.php
+++ b/Tests/Observer/ObserverTest.php
@@ -36,11 +36,11 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     public function testAttachDetach()
     {
         $subject = new User();
-        $this->assertAttributeEmpty('_observers', $subject);
+        $this->assertAttributeEmpty('observers', $subject);
         $subject->attach($this->observer);
-        $this->assertAttributeNotEmpty('_observers', $subject);
+        $this->assertAttributeNotEmpty('observers', $subject);
         $subject->detach($this->observer);
-        $this->assertAttributeEmpty('_observers', $subject);
+        $this->assertAttributeEmpty('observers', $subject);
     }
 
     /**
diff --git a/Tests/SimpleFactory/SimpleFactoryTest.php b/Tests/SimpleFactory/SimpleFactoryTest.php
index 82db42d..48c949c 100644
--- a/Tests/SimpleFactory/SimpleFactoryTest.php
+++ b/Tests/SimpleFactory/SimpleFactoryTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\SimpleFactory;
 
 use DesignPatterns\SimpleFactory\ConcreteFactory;
@@ -35,7 +31,7 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = $this->factory->createVehicle($type);
-        $this->assertInstanceOf('DesignPatterns\SimpleFactory\Vehicle', $obj);
+        $this->assertInstanceOf('DesignPatterns\SimpleFactory\VehicleInterface', $obj);
     }
 
     /**
diff --git a/Tests/Singleton/SingletonTest.php b/Tests/Singleton/SingletonTest.php
index 7291f9d..8d1405e 100644
--- a/Tests/Singleton/SingletonTest.php
+++ b/Tests/Singleton/SingletonTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Singleton;
 
 use DesignPatterns\Singleton\Singleton;
@@ -30,5 +26,4 @@ class SingletonTest extends \PHPUnit_Framework_TestCase
         $meth = $refl->getMethod('__construct');
         $this->assertTrue($meth->isPrivate());
     }
-
-}
\ No newline at end of file
+}
diff --git a/Tests/StaticFactory/StaticFactoryTest.php b/Tests/StaticFactory/StaticFactoryTest.php
index e906705..d85f266 100644
--- a/Tests/StaticFactory/StaticFactoryTest.php
+++ b/Tests/StaticFactory/StaticFactoryTest.php
@@ -25,7 +25,6 @@ class StaticFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = StaticFactory::factory($type);
-        $this->assertInstanceOf('DesignPatterns\StaticFactory\Formatter', $obj);
+        $this->assertInstanceOf('DesignPatterns\StaticFactory\FormatterInterface', $obj);
     }
-
 }
diff --git a/Tests/TemplateMethod/JourneyTest.php b/Tests/TemplateMethod/JourneyTest.php
index fcfc4e6..f592363 100644
--- a/Tests/TemplateMethod/JourneyTest.php
+++ b/Tests/TemplateMethod/JourneyTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\TemplateMethod;
 
 use DesignPatterns\TemplateMethod;
@@ -23,7 +19,7 @@ class JourneyTest extends \PHPUnit_Framework_TestCase
 
     public function testCity()
     {
-        $journey = new TemplateMethod\CityJouney();
+        $journey = new TemplateMethod\CityJourney();
         $this->expectOutputRegex('#drink#');
         $journey->takeATrip();
     }
diff --git a/Tests/Visitor/VisitorTest.php b/Tests/Visitor/VisitorTest.php
index dfca346..c7b911e 100644
--- a/Tests/Visitor/VisitorTest.php
+++ b/Tests/Visitor/VisitorTest.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\Tests\Visitor;
 
 use DesignPatterns\Visitor;
@@ -39,7 +35,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Mock
      */
     public function testUnknownObject()
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index 78d586e..4a725a2 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -1,8 +1,8 @@
 <?php
 
 spl_autoload_register(function ($class) {
-            if (preg_match('#^DesignPatterns\\\\(.+)$#', $class, $ret)) {
-                $relPath = str_replace('\\', DIRECTORY_SEPARATOR, $ret[1]);
-                require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . $relPath . '.php';
-            }
-        });
\ No newline at end of file
+    if (preg_match('#^DesignPatterns\\\\(.+)$#', $class, $ret)) {
+        $relPath = str_replace('\\', DIRECTORY_SEPARATOR, $ret[1]);
+        require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . $relPath . '.php';
+    }
+});
diff --git a/Visitor/Group.php b/Visitor/Group.php
index 972e95c..5d47d6a 100644
--- a/Visitor/Group.php
+++ b/Visitor/Group.php
@@ -3,11 +3,10 @@
 namespace DesignPatterns\Visitor;
 
 /**
- * An example of a Visitee : Group
+ * An example of a Visitor: Group
  */
 class Group extends Role
 {
-
     /**
      * @var string
      */
@@ -28,5 +27,4 @@ class Group extends Role
     {
         return "Group: " . $this->name;
     }
-
 }
diff --git a/Visitor/Role.php b/Visitor/Role.php
index 6d72cc5..6f5a0c4 100644
--- a/Visitor/Role.php
+++ b/Visitor/Role.php
@@ -7,34 +7,34 @@ namespace DesignPatterns\Visitor;
  *
  * Purpose:
  * The Visitor Pattern lets you outsource operations on objects to other objects. The main reason to do this is to keep
- * a seperation of concerns. But classes have to define an contract to allow visitors (the "accept" method in the example below).
+ * a separation of concerns. But classes have to define an contract to allow visitors (the "accept" method in the example below).
  * 
  * The contract is an abstract class but you can have also a clean interface. 
- * In that case, each Visitee has to choose itself which method to invoke on the visitor.
+ * In that case, each Visitor has to choose itself which method to invoke on the visitor.
  */
 abstract class Role
 {
-
     /**
-     * This method handles a double dispatch based on the shortname of the Visitee
-     * 
+     * This method handles a double dispatch based on the short name of the Visitor
+     *
      * Feel free to override it if your object must call another visiting behavior
-     * 
-     * @param \DesignPatterns\Visitor\RoleVisitor $visitor
+     *
+     * @param \DesignPatterns\Visitor\RoleVisitorInterface $visitor
+     *
+     * @throws \InvalidArgumentException
      */
-    public function accept(RoleVisitor $visitor)
+    public function accept(RoleVisitorInterface $visitor)
     {
         // this trick to simulate double-dispatch based on type-hinting
-        $fqcn = get_called_class();
-        preg_match('#([^\\\\]+)$#', $fqcn, $extract);
+        $klass = get_called_class();
+        preg_match('#([^\\\\]+)$#', $klass, $extract);
         $visitingMethod = 'visit' . $extract[1];
 
         // this ensures strong typing with visitor interface, not some visitor objects
-        if (!method_exists(__NAMESPACE__ . '\RoleVisitor', $visitingMethod)) {
-            throw new \InvalidArgumentException("The visitor you provide cannot visit a $fqcn instance");
+        if (!method_exists(__NAMESPACE__ . '\RoleVisitorInterface', $visitingMethod)) {
+            throw new \InvalidArgumentException("The visitor you provide cannot visit a $klass instance");
         }
 
         call_user_func(array($visitor, $visitingMethod), $this);
     }
-
 }
diff --git a/Visitor/RolePrintVisitor.php b/Visitor/RolePrintVisitor.php
index 24a8b1e..40d447f 100644
--- a/Visitor/RolePrintVisitor.php
+++ b/Visitor/RolePrintVisitor.php
@@ -7,11 +7,10 @@ namespace DesignPatterns\Visitor;
  *
  * An implementation of a concrete Visitor
  */
-class RolePrintVisitor implements RoleVisitor
+class RolePrintVisitor implements RoleVisitorInterface
 {
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function visitGroup(Group $role)
     {
@@ -19,11 +18,10 @@ class RolePrintVisitor implements RoleVisitor
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function visitUser(User $role)
     {
         echo "Role: " . $role->getName();
     }
-
 }
diff --git a/Visitor/RoleVisitor.php b/Visitor/RoleVisitorInterface.php
similarity index 91%
rename from Visitor/RoleVisitor.php
rename to Visitor/RoleVisitorInterface.php
index 634024d..8c1852a 100644
--- a/Visitor/RoleVisitor.php
+++ b/Visitor/RoleVisitorInterface.php
@@ -13,9 +13,8 @@ namespace DesignPatterns\Visitor;
  * Note 2 : the visitor must not choose itself which method to
  * invoke, it is the Visitee that make this decision.
  */
-interface RoleVisitor
+interface RoleVisitorInterface
 {
-
     /**
      * Visit a User object
      * 
@@ -24,7 +23,7 @@ interface RoleVisitor
     public function visitUser(User $role);
 
     /**
-     * Visit a Group objet
+     * Visit a Group object
      * 
      * @param \DesignPatterns\Visitor\Group $role
      */
diff --git a/Visitor/User.php b/Visitor/User.php
index 3555933..f9291fa 100644
--- a/Visitor/User.php
+++ b/Visitor/User.php
@@ -9,7 +9,6 @@ namespace DesignPatterns\Visitor;
  */
 class User extends Role
 {
-
     /**
      * @var string
      */
@@ -30,6 +29,4 @@ class User extends Role
     {
         return "User " . $this->name;
     }
-
 }
-