diff --git a/FactoryMethod/Bicycle.php b/FactoryMethod/Bicycle.php
index 772dcdf..0c71ba2 100644
--- a/FactoryMethod/Bicycle.php
+++ b/FactoryMethod/Bicycle.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -11,10 +7,18 @@ namespace DesignPatterns\FactoryMethod;
  */
 class Bicycle implements Vehicle
 {
+    /**
+     * @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..89a3ba9 100644
--- a/FactoryMethod/FactoryMethod.php
+++ b/FactoryMethod/FactoryMethod.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -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..d5186d2 100644
--- a/FactoryMethod/Ferrari.php
+++ b/FactoryMethod/Ferrari.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -11,10 +7,16 @@ namespace DesignPatterns\FactoryMethod;
  */
 class Ferrari implements Vehicle
 {
+    /**
+     * @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..acbac40 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 :
                 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..cb8338c 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 :
                 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..fb6e8ea 100644
--- a/FactoryMethod/Porsche.php
+++ b/FactoryMethod/Porsche.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -11,15 +7,25 @@ namespace DesignPatterns\FactoryMethod;
  */
 class Porsche implements Vehicle
 {
+    /**
+     * @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
index 180a349..591873d 100644
--- a/FactoryMethod/Vehicle.php
+++ b/FactoryMethod/Vehicle.php
@@ -1,9 +1,5 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\FactoryMethod;
 
 /**
@@ -11,6 +7,10 @@ namespace DesignPatterns\FactoryMethod;
  */
 interface Vehicle
 {
-
+    /**
+     * sets the color of the vehicle
+     *
+     * @param string $rgb
+     */
     function setColor($rgb);
-}
\ No newline at end of file
+}