diff --git a/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php b/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
index 8acaad1..d7cbe52 100644
--- a/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
+++ b/Behavioral/ChainOfResponsibilities/Responsible/FastStorage.php
@@ -5,9 +5,6 @@ namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 use DesignPatterns\Behavioral\ChainOfResponsibilities\Handler;
 use DesignPatterns\Behavioral\ChainOfResponsibilities\Request;
 
-/**
- * Class FastStorage.
- */
 class FastStorage extends Handler
 {
     /**
diff --git a/Behavioral/State/CreateOrder.php b/Behavioral/State/CreateOrder.php
index 7ac48d4..19c6b4a 100644
--- a/Behavioral/State/CreateOrder.php
+++ b/Behavioral/State/CreateOrder.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\State;
 
-/**
- * Class CreateOrder.
- */
 class CreateOrder implements OrderInterface
 {
     /**
diff --git a/Behavioral/State/OrderController.php b/Behavioral/State/OrderController.php
index 93ac542..99ade5f 100644
--- a/Behavioral/State/OrderController.php
+++ b/Behavioral/State/OrderController.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\State;
 
-/**
- * Class OrderController.
- */
 class OrderController
 {
     /**
diff --git a/Behavioral/State/OrderFactory.php b/Behavioral/State/OrderFactory.php
index 205d505..a2d3261 100644
--- a/Behavioral/State/OrderFactory.php
+++ b/Behavioral/State/OrderFactory.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\State;
 
-/**
- * Class OrderFactory.
- */
 class OrderFactory
 {
     private function __construct()
diff --git a/Behavioral/State/OrderInterface.php b/Behavioral/State/OrderInterface.php
index 6a97e69..1f86b96 100644
--- a/Behavioral/State/OrderInterface.php
+++ b/Behavioral/State/OrderInterface.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\State;
 
-/**
- * Class OrderInterface.
- */
 interface OrderInterface
 {
     /**
diff --git a/Behavioral/State/ShippingOrder.php b/Behavioral/State/ShippingOrder.php
index 943d714..0ffa068 100644
--- a/Behavioral/State/ShippingOrder.php
+++ b/Behavioral/State/ShippingOrder.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\State;
 
-/**
- * Class ShippingOrder.
- */
 class ShippingOrder implements OrderInterface
 {
     /**
diff --git a/Behavioral/Strategy/ComparatorInterface.php b/Behavioral/Strategy/ComparatorInterface.php
index f472fd9..8e3c893 100644
--- a/Behavioral/Strategy/ComparatorInterface.php
+++ b/Behavioral/Strategy/ComparatorInterface.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\Strategy;
 
-/**
- * Class ComparatorInterface.
- */
 interface ComparatorInterface
 {
     /**
diff --git a/Behavioral/Strategy/DateComparator.php b/Behavioral/Strategy/DateComparator.php
index d355dc9..37fc3ba 100644
--- a/Behavioral/Strategy/DateComparator.php
+++ b/Behavioral/Strategy/DateComparator.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\Strategy;
 
-/**
- * Class DateComparator.
- */
 class DateComparator implements ComparatorInterface
 {
     /**
diff --git a/Behavioral/Strategy/IdComparator.php b/Behavioral/Strategy/IdComparator.php
index f829195..1f882a1 100644
--- a/Behavioral/Strategy/IdComparator.php
+++ b/Behavioral/Strategy/IdComparator.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\Strategy;
 
-/**
- * Class IdComparator.
- */
 class IdComparator implements ComparatorInterface
 {
     /**
diff --git a/Behavioral/Strategy/ObjectCollection.php b/Behavioral/Strategy/ObjectCollection.php
index b5c1bd2..ed20969 100644
--- a/Behavioral/Strategy/ObjectCollection.php
+++ b/Behavioral/Strategy/ObjectCollection.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Behavioral\Strategy;
 
-/**
- * Class ObjectCollection.
- */
 class ObjectCollection
 {
     /**
diff --git a/Creational/AbstractFactory/Html/Picture.php b/Creational/AbstractFactory/Html/Picture.php
index 3abacb4..e5f430b 100644
--- a/Creational/AbstractFactory/Html/Picture.php
+++ b/Creational/AbstractFactory/Html/Picture.php
@@ -4,11 +4,6 @@ namespace DesignPatterns\Creational\AbstractFactory\Html;
 
 use DesignPatterns\Creational\AbstractFactory\Picture as BasePicture;
 
-/**
- * Class Picture.
- *
- * Picture is a concrete image for HTML rendering
- */
 class Picture extends BasePicture
 {
     /**
diff --git a/Creational/AbstractFactory/Html/Text.php b/Creational/AbstractFactory/Html/Text.php
index 8c33da6..32d9350 100644
--- a/Creational/AbstractFactory/Html/Text.php
+++ b/Creational/AbstractFactory/Html/Text.php
@@ -4,11 +4,6 @@ namespace DesignPatterns\Creational\AbstractFactory\Html;
 
 use DesignPatterns\Creational\AbstractFactory\Text as BaseText;
 
-/**
- * Class Text.
- *
- * Text is a concrete text for HTML rendering
- */
 class Text extends BaseText
 {
     /**
diff --git a/Creational/AbstractFactory/HtmlFactory.php b/Creational/AbstractFactory/HtmlFactory.php
index 5c22859..1d622e1 100644
--- a/Creational/AbstractFactory/HtmlFactory.php
+++ b/Creational/AbstractFactory/HtmlFactory.php
@@ -2,11 +2,6 @@
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
-/**
- * Class HtmlFactory.
- *
- * HtmlFactory is a concrete factory for HTML component
- */
 class HtmlFactory extends AbstractFactory
 {
     /**
diff --git a/Creational/AbstractFactory/Json/Picture.php b/Creational/AbstractFactory/Json/Picture.php
index 77bb150..cee82dd 100644
--- a/Creational/AbstractFactory/Json/Picture.php
+++ b/Creational/AbstractFactory/Json/Picture.php
@@ -4,11 +4,6 @@ namespace DesignPatterns\Creational\AbstractFactory\Json;
 
 use DesignPatterns\Creational\AbstractFactory\Picture as BasePicture;
 
-/**
- * Class Picture.
- *
- * Picture is a concrete image for JSON rendering
- */
 class Picture extends BasePicture
 {
     /**
diff --git a/Creational/AbstractFactory/Json/Text.php b/Creational/AbstractFactory/Json/Text.php
index 4c51785..df69a4d 100644
--- a/Creational/AbstractFactory/Json/Text.php
+++ b/Creational/AbstractFactory/Json/Text.php
@@ -4,11 +4,6 @@ namespace DesignPatterns\Creational\AbstractFactory\Json;
 
 use DesignPatterns\Creational\AbstractFactory\Text as BaseText;
 
-/**
- * Class Text.
- *
- * Text is a text component with a JSON rendering
- */
 class Text extends BaseText
 {
     /**
diff --git a/Creational/AbstractFactory/JsonFactory.php b/Creational/AbstractFactory/JsonFactory.php
index 63a9979..945f55d 100644
--- a/Creational/AbstractFactory/JsonFactory.php
+++ b/Creational/AbstractFactory/JsonFactory.php
@@ -2,12 +2,6 @@
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
-/**
- * Class JsonFactory.
- *
- * JsonFactory is a factory for creating a family of JSON component
- * (example for ajax)
- */
 class JsonFactory extends AbstractFactory
 {
     /**
diff --git a/Creational/AbstractFactory/Picture.php b/Creational/AbstractFactory/Picture.php
index 89fd66f..e0b4172 100644
--- a/Creational/AbstractFactory/Picture.php
+++ b/Creational/AbstractFactory/Picture.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
-/**
- * Class Picture.
- */
 abstract class Picture implements MediaInterface
 {
     /**
diff --git a/Creational/AbstractFactory/Text.php b/Creational/AbstractFactory/Text.php
index 30984f3..593c4e5 100644
--- a/Creational/AbstractFactory/Text.php
+++ b/Creational/AbstractFactory/Text.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
-/**
- * Class Text.
- */
 abstract class Text implements MediaInterface
 {
     /**
diff --git a/Creational/Builder/Parts/Door.php b/Creational/Builder/Parts/Door.php
index fc12608..f2732fe 100644
--- a/Creational/Builder/Parts/Door.php
+++ b/Creational/Builder/Parts/Door.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
-/**
- * Class Door.
- */
 class Door
 {
 }
diff --git a/Creational/Builder/Parts/Engine.php b/Creational/Builder/Parts/Engine.php
index 5232ab3..48046b8 100644
--- a/Creational/Builder/Parts/Engine.php
+++ b/Creational/Builder/Parts/Engine.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
-/**
- * Class Engine.
- */
 class Engine
 {
 }
diff --git a/Creational/Builder/Parts/Wheel.php b/Creational/Builder/Parts/Wheel.php
index 0a1afbd..4e677e3 100644
--- a/Creational/Builder/Parts/Wheel.php
+++ b/Creational/Builder/Parts/Wheel.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
-/**
- * Class Wheel.
- */
 class Wheel
 {
 }
diff --git a/Creational/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
index 7c9b72b..c323a8c 100644
--- a/Creational/Prototype/BarBookPrototype.php
+++ b/Creational/Prototype/BarBookPrototype.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\Prototype;
 
-/**
- * Class BarBookPrototype.
- */
 class BarBookPrototype extends BookPrototype
 {
     /**
diff --git a/Creational/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
index 95ea9e6..47c73e6 100644
--- a/Creational/Prototype/FooBookPrototype.php
+++ b/Creational/Prototype/FooBookPrototype.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\Prototype;
 
-/**
- * Class FooBookPrototype.
- */
 class FooBookPrototype extends BookPrototype
 {
     protected $category = 'Foo';
diff --git a/Creational/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
index e577ab2..69fd9e1 100644
--- a/Creational/StaticFactory/FormatNumber.php
+++ b/Creational/StaticFactory/FormatNumber.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\StaticFactory;
 
-/**
- * Class FormatNumber.
- */
 class FormatNumber implements FormatterInterface
 {
 }
diff --git a/Creational/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
index 5cb9e28..14c2055 100644
--- a/Creational/StaticFactory/FormatString.php
+++ b/Creational/StaticFactory/FormatString.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\StaticFactory;
 
-/**
- * Class FormatString.
- */
 class FormatString implements FormatterInterface
 {
 }
diff --git a/Creational/StaticFactory/FormatterInterface.php b/Creational/StaticFactory/FormatterInterface.php
index 349f8b6..22ea0de 100644
--- a/Creational/StaticFactory/FormatterInterface.php
+++ b/Creational/StaticFactory/FormatterInterface.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Creational\StaticFactory;
 
-/**
- * Class FormatterInterface.
- */
 interface FormatterInterface
 {
 }
diff --git a/More/Delegation/JuniorDeveloper.php b/More/Delegation/JuniorDeveloper.php
index 0946dad..64e2ff6 100644
--- a/More/Delegation/JuniorDeveloper.php
+++ b/More/Delegation/JuniorDeveloper.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\More\Delegation;
 
-/**
- * Class JuniorDeveloper.
- */
 class JuniorDeveloper
 {
     public function writeBadCode()
diff --git a/More/Delegation/TeamLead.php b/More/Delegation/TeamLead.php
index 9b75190..b617d54 100644
--- a/More/Delegation/TeamLead.php
+++ b/More/Delegation/TeamLead.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\More\Delegation;
 
-/**
- * Class TeamLead.
- */
 class TeamLead
 {
     /** @var JuniorDeveloper */
diff --git a/More/EAV/Attribute.php b/More/EAV/Attribute.php
index 3874360..dda66e9 100644
--- a/More/EAV/Attribute.php
+++ b/More/EAV/Attribute.php
@@ -4,9 +4,6 @@ namespace DesignPatterns\More\EAV;
 
 use SplObjectStorage;
 
-/**
- * Class Attribute.
- */
 class Attribute implements ValueAccessInterface
 {
     /**
diff --git a/More/EAV/Entity.php b/More/EAV/Entity.php
index ff26589..e98f11a 100644
--- a/More/EAV/Entity.php
+++ b/More/EAV/Entity.php
@@ -4,9 +4,6 @@ namespace DesignPatterns\More\EAV;
 
 use SplObjectStorage;
 
-/**
- * Class Entity.
- */
 class Entity implements ValueAccessInterface
 {
     /**
diff --git a/More/EAV/Value.php b/More/EAV/Value.php
index da4370f..e3556c6 100644
--- a/More/EAV/Value.php
+++ b/More/EAV/Value.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\More\EAV;
 
-/**
- * Class Value.
- */
 class Value implements ValueInterface
 {
     /**
diff --git a/More/Repository/MemoryStorage.php b/More/Repository/MemoryStorage.php
index 44276d5..d970773 100644
--- a/More/Repository/MemoryStorage.php
+++ b/More/Repository/MemoryStorage.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\More\Repository;
 
-/**
- * Class MemoryStorage.
- */
 class MemoryStorage implements Storage
 {
     private $data;
diff --git a/More/Repository/Post.php b/More/Repository/Post.php
index e9990b4..6fdcfc0 100644
--- a/More/Repository/Post.php
+++ b/More/Repository/Post.php
@@ -2,11 +2,6 @@
 
 namespace DesignPatterns\More\Repository;
 
-/**
- * Post represents entity for some post that user left on the site.
- *
- * Class Post
- */
 class Post
 {
     /**
diff --git a/More/Repository/PostRepository.php b/More/Repository/PostRepository.php
index e7687f3..2f92dd3 100644
--- a/More/Repository/PostRepository.php
+++ b/More/Repository/PostRepository.php
@@ -3,16 +3,13 @@
 namespace DesignPatterns\More\Repository;
 
 /**
- * Repository for class Post
- * This class is between Entity layer(class Post) and access object layer(interface Storage).
+ * This class is between Entity layer (class Post) and access object layer (interface Storage).
  *
  * Repository encapsulates the set of objects persisted in a data store and the operations performed over them
  * providing a more object-oriented view of the persistence layer
  *
  * Repository also supports the objective of achieving a clean separation and one-way dependency
  * between the domain and data mapping layers
- *
- * Class PostRepository
  */
 class PostRepository
 {
diff --git a/Structural/Composite/FormElement.php b/Structural/Composite/FormElement.php
index 0055aee..76ecf31 100644
--- a/Structural/Composite/FormElement.php
+++ b/Structural/Composite/FormElement.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Composite;
 
-/**
- * Class FormElement.
- */
 abstract class FormElement
 {
     /**
diff --git a/Structural/Composite/InputElement.php b/Structural/Composite/InputElement.php
index 19786d5..44ac047 100644
--- a/Structural/Composite/InputElement.php
+++ b/Structural/Composite/InputElement.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Composite;
 
-/**
- * Class InputElement.
- */
 class InputElement extends FormElement
 {
     /**
diff --git a/Structural/Composite/TextElement.php b/Structural/Composite/TextElement.php
index 48b33ba..8bd56b5 100644
--- a/Structural/Composite/TextElement.php
+++ b/Structural/Composite/TextElement.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Composite;
 
-/**
- * Class TextElement.
- */
 class TextElement extends FormElement
 {
     /**
diff --git a/Structural/Decorator/RenderInJson.php b/Structural/Decorator/RenderInJson.php
index fb9a71e..e950e28 100644
--- a/Structural/Decorator/RenderInJson.php
+++ b/Structural/Decorator/RenderInJson.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Decorator;
 
-/**
- * Class RenderInJson.
- */
 class RenderInJson extends Decorator
 {
     /**
diff --git a/Structural/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
index f203d53..5afffda 100644
--- a/Structural/Decorator/RenderInXml.php
+++ b/Structural/Decorator/RenderInXml.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Decorator;
 
-/**
- * Class RenderInXml.
- */
 class RenderInXml extends Decorator
 {
     /**
diff --git a/Structural/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
index 73152b9..e7b95eb 100644
--- a/Structural/Decorator/RendererInterface.php
+++ b/Structural/Decorator/RendererInterface.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Decorator;
 
-/**
- * Class RendererInterface.
- */
 interface RendererInterface
 {
     /**
diff --git a/Structural/Decorator/Webservice.php b/Structural/Decorator/Webservice.php
index e2bcc69..1151672 100644
--- a/Structural/Decorator/Webservice.php
+++ b/Structural/Decorator/Webservice.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Decorator;
 
-/**
- * Class Webservice.
- */
 class Webservice implements RendererInterface
 {
     /**
diff --git a/Structural/DependencyInjection/Connection.php b/Structural/DependencyInjection/Connection.php
index d389089..1a5764c 100644
--- a/Structural/DependencyInjection/Connection.php
+++ b/Structural/DependencyInjection/Connection.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\DependencyInjection;
 
-/**
- * Class Connection.
- */
 class Connection
 {
     /**
diff --git a/Structural/Facade/Facade.php b/Structural/Facade/Facade.php
index 43d1bcb..f199600 100644
--- a/Structural/Facade/Facade.php
+++ b/Structural/Facade/Facade.php
@@ -2,9 +2,6 @@
 
 namespace DesignPatterns\Structural\Facade;
 
-/**
- * Class Facade.
- */
 class Facade
 {
     /**