diff --git a/Command/Command.php b/Command/Command.php
index 17d639e..005d0b6 100644
--- a/Command/Command.php
+++ b/Command/Command.php
@@ -8,7 +8,7 @@ namespace DesignPatterns\Command;
  * Purpose: To encapsulate invocation and decoupling
  * 
  * We have an Invoker and a Receiver. This pattern use a "Command" to delegate the
- * method call against the Receiver and use the same method "execute".
+ * method call against the Receiver and presents the same method "execute".
  * Therefore, the Invoker just know to call "execute" to process the Command of
  * the client. The Receiver is decoupled from the Invoker
  * 
@@ -28,7 +28,7 @@ interface Command
 
     /**
      * this is the most important method in the Command pattern,
-     * The Receiver go in the constructor.
+     * The Receiver goes in the constructor.
      */
     public function execute();
 }
diff --git a/Facade/Facade.php b/Facade/Facade.php
index 612bc4f..5dda3b0 100644
--- a/Facade/Facade.php
+++ b/Facade/Facade.php
@@ -10,7 +10,7 @@ namespace DesignPatterns\Facade;
  * The primary goal of a Facade Pattern is not to avoid you to read the manual of
  * a complex API. It's only a side-effect.
  * 
- * The first goal is to reduce coupling and folow the Law of Demeter.
+ * The first goal is to reduce coupling and follow the Law of Demeter.
  * 
  * A Facade is meant to decouple a client and a sub-system by embedding
  * many (but sometimes just one) interface, and of course to reduce complexity.
diff --git a/Iterator/CardGame.php b/Iterator/CardGame.php
index c4b3898..f6dd081 100644
--- a/Iterator/CardGame.php
+++ b/Iterator/CardGame.php
@@ -23,7 +23,7 @@ namespace DesignPatterns\Iterator;
  * arrays.
  * 
  * If tomorrow you decide to read cards from a database, the client 
- * (see the PHPUnit test) will remain unchanged. That's beauty of it.
+ * (see the PHPUnit test) will remain unchanged. That's the beauty of it.
  */
 class CardGame implements \Iterator
 {
diff --git a/Tests/Composite/FormTest.php b/Tests/Composite/FormTest.php
index a706c99..41cf904 100644
--- a/Tests/Composite/FormTest.php
+++ b/Tests/Composite/FormTest.php
@@ -29,7 +29,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
 
     /**
      * The all point of this pattern, a Composite must inherit from the node
-     * if you wanto to builld trees
+     * if you want to builld trees
      */
     public function testFormImplementsFormEelement()
     {
diff --git a/Tests/Decorator/DecoratorTest.php b/Tests/Decorator/DecoratorTest.php
index 35e19a7..fce9e56 100644
--- a/Tests/Decorator/DecoratorTest.php
+++ b/Tests/Decorator/DecoratorTest.php
@@ -46,6 +46,8 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
+     * Second key-point of this pattern : the decorator is type-hinted
+     * 
      * @expectedException \PHPUnit_Framework_Error
      */
     public function testDecoratorTypeHinted()
@@ -53,6 +55,9 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
         $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array(new \stdClass()));
     }
 
+    /**
+     * The decorator implements and wraps the same interface
+     */
     public function testDecoratorOnlyAcceptRenderer()
     {
         $mock = $this->getMock('DesignPatterns\Decorator\Renderer');
diff --git a/Tests/Iterator/IteratorTest.php b/Tests/Iterator/IteratorTest.php
index 6b9fd12..37b9a40 100644
--- a/Tests/Iterator/IteratorTest.php
+++ b/Tests/Iterator/IteratorTest.php
@@ -9,9 +9,7 @@ namespace DesignPatterns\Tests\Iterator;
 use DesignPatterns\Iterator\CardGame;
 
 /**
- * IteratorTest the CardGame iterator
- *
- * @author flo
+ * IteratorTest tests the CardGame iterator
  */
 class IteratorTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +23,7 @@ class IteratorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * This is the client of the iterator.
-     * It remains unchanged even if one I decide to use MongoDB to store the
+     * It remains unchanged even if one day I decide to use MongoDB to store the
      * card.
      */
     public function testCardinal()
diff --git a/Tests/SimpleFactory/SimpleFactoryTest.php b/Tests/SimpleFactory/SimpleFactoryTest.php
index 3494ca2..82db42d 100644
--- a/Tests/SimpleFactory/SimpleFactoryTest.php
+++ b/Tests/SimpleFactory/SimpleFactoryTest.php
@@ -10,8 +10,6 @@ use DesignPatterns\SimpleFactory\ConcreteFactory;
 
 /**
  * SimpleFactoryTest tests the Simple Factory pattern
- *
- * @author flo
  */
 class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
 {