diff --git a/Behavioral/ChainOfResponsibilities/Handler.php b/Behavioral/ChainOfResponsibilities/Handler.php
index 595d7d1..3701001 100644
--- a/Behavioral/ChainOfResponsibilities/Handler.php
+++ b/Behavioral/ChainOfResponsibilities/Handler.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities;
 
diff --git a/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php b/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php
index 631e551..a9c1723 100644
--- a/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php
+++ b/Behavioral/ChainOfResponsibilities/Responsible/HttpInMemoryCacheHandler.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 
diff --git a/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php b/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php
index 1d25993..943e53b 100644
--- a/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php
+++ b/Behavioral/ChainOfResponsibilities/Responsible/SlowDatabaseHandler.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible;
 
diff --git a/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
index d47b7b1..2dd6eb2 100644
--- a/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
+++ b/Behavioral/ChainOfResponsibilities/Tests/ChainTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\ChainOfResponsibilities\Tests;
 
diff --git a/Behavioral/Command/AddMessageDateCommand.php b/Behavioral/Command/AddMessageDateCommand.php
index 74fc441..8b94b76 100644
--- a/Behavioral/Command/AddMessageDateCommand.php
+++ b/Behavioral/Command/AddMessageDateCommand.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Command/Command.php b/Behavioral/Command/Command.php
index 9330359..06f3d53 100644
--- a/Behavioral/Command/Command.php
+++ b/Behavioral/Command/Command.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Command/HelloCommand.php b/Behavioral/Command/HelloCommand.php
index 8b088d1..e191106 100644
--- a/Behavioral/Command/HelloCommand.php
+++ b/Behavioral/Command/HelloCommand.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Command/Invoker.php b/Behavioral/Command/Invoker.php
index 7e1f41e..9431ade 100644
--- a/Behavioral/Command/Invoker.php
+++ b/Behavioral/Command/Invoker.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Command/Receiver.php b/Behavioral/Command/Receiver.php
index 4eda52b..6e0e507 100644
--- a/Behavioral/Command/Receiver.php
+++ b/Behavioral/Command/Receiver.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Command/Tests/CommandTest.php b/Behavioral/Command/Tests/CommandTest.php
index b10398c..2d0626c 100644
--- a/Behavioral/Command/Tests/CommandTest.php
+++ b/Behavioral/Command/Tests/CommandTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command\Tests;
 
diff --git a/Behavioral/Command/Tests/UndoableCommandTest.php b/Behavioral/Command/Tests/UndoableCommandTest.php
index a79f471..cbd885c 100644
--- a/Behavioral/Command/Tests/UndoableCommandTest.php
+++ b/Behavioral/Command/Tests/UndoableCommandTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command\Tests;
 
diff --git a/Behavioral/Command/UndoableCommand.php b/Behavioral/Command/UndoableCommand.php
index ce8de92..055ddde 100644
--- a/Behavioral/Command/UndoableCommand.php
+++ b/Behavioral/Command/UndoableCommand.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Command;
 
diff --git a/Behavioral/Iterator/Book.php b/Behavioral/Iterator/Book.php
index 71cf460..e31a60d 100644
--- a/Behavioral/Iterator/Book.php
+++ b/Behavioral/Iterator/Book.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator;
 
diff --git a/Behavioral/Iterator/BookList.php b/Behavioral/Iterator/BookList.php
index e118565..dbb9232 100644
--- a/Behavioral/Iterator/BookList.php
+++ b/Behavioral/Iterator/BookList.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator;
 
diff --git a/Behavioral/Iterator/Tests/IteratorTest.php b/Behavioral/Iterator/Tests/IteratorTest.php
index 1f18cff..3012f46 100644
--- a/Behavioral/Iterator/Tests/IteratorTest.php
+++ b/Behavioral/Iterator/Tests/IteratorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Iterator\Tests;
 
diff --git a/Behavioral/Mediator/Colleague.php b/Behavioral/Mediator/Colleague.php
index 50582e5..972bf11 100644
--- a/Behavioral/Mediator/Colleague.php
+++ b/Behavioral/Mediator/Colleague.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 
diff --git a/Behavioral/Mediator/Mediator.php b/Behavioral/Mediator/Mediator.php
index 8af3361..20a7456 100644
--- a/Behavioral/Mediator/Mediator.php
+++ b/Behavioral/Mediator/Mediator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 
diff --git a/Behavioral/Mediator/MediatorInterface.php b/Behavioral/Mediator/MediatorInterface.php
index f5274c2..5b7db70 100644
--- a/Behavioral/Mediator/MediatorInterface.php
+++ b/Behavioral/Mediator/MediatorInterface.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator;
 
diff --git a/Behavioral/Mediator/Subsystem/Client.php b/Behavioral/Mediator/Subsystem/Client.php
index 16026b3..bdf157c 100644
--- a/Behavioral/Mediator/Subsystem/Client.php
+++ b/Behavioral/Mediator/Subsystem/Client.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
diff --git a/Behavioral/Mediator/Subsystem/Database.php b/Behavioral/Mediator/Subsystem/Database.php
index 5e07fdc..383d358 100644
--- a/Behavioral/Mediator/Subsystem/Database.php
+++ b/Behavioral/Mediator/Subsystem/Database.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
diff --git a/Behavioral/Mediator/Subsystem/Server.php b/Behavioral/Mediator/Subsystem/Server.php
index 883b21f..a1bc960 100644
--- a/Behavioral/Mediator/Subsystem/Server.php
+++ b/Behavioral/Mediator/Subsystem/Server.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Mediator\Subsystem;
 
diff --git a/Behavioral/Mediator/Tests/MediatorTest.php b/Behavioral/Mediator/Tests/MediatorTest.php
index 983b01e..8b93a64 100644
--- a/Behavioral/Mediator/Tests/MediatorTest.php
+++ b/Behavioral/Mediator/Tests/MediatorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Tests\Mediator\Tests;
 
diff --git a/Behavioral/Memento/Memento.php b/Behavioral/Memento/Memento.php
index e7b01d0..4f2f25a 100644
--- a/Behavioral/Memento/Memento.php
+++ b/Behavioral/Memento/Memento.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 
diff --git a/Behavioral/Memento/State.php b/Behavioral/Memento/State.php
index 30b4450..f872605 100644
--- a/Behavioral/Memento/State.php
+++ b/Behavioral/Memento/State.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 
diff --git a/Behavioral/Memento/Tests/MementoTest.php b/Behavioral/Memento/Tests/MementoTest.php
index c5c74fc..9870bde 100644
--- a/Behavioral/Memento/Tests/MementoTest.php
+++ b/Behavioral/Memento/Tests/MementoTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento\Tests;
 
diff --git a/Behavioral/Memento/Ticket.php b/Behavioral/Memento/Ticket.php
index 00ff42d..16bc1b5 100644
--- a/Behavioral/Memento/Ticket.php
+++ b/Behavioral/Memento/Ticket.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Memento;
 
diff --git a/Behavioral/NullObject/Logger.php b/Behavioral/NullObject/Logger.php
index c9a345d..4e66df1 100644
--- a/Behavioral/NullObject/Logger.php
+++ b/Behavioral/NullObject/Logger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 
diff --git a/Behavioral/NullObject/NullLogger.php b/Behavioral/NullObject/NullLogger.php
index 5f19370..7e3b03f 100644
--- a/Behavioral/NullObject/NullLogger.php
+++ b/Behavioral/NullObject/NullLogger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 
diff --git a/Behavioral/NullObject/PrintLogger.php b/Behavioral/NullObject/PrintLogger.php
index 9eecd5e..e8d54bc 100644
--- a/Behavioral/NullObject/PrintLogger.php
+++ b/Behavioral/NullObject/PrintLogger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 
diff --git a/Behavioral/NullObject/Service.php b/Behavioral/NullObject/Service.php
index 943920d..b3bc312 100644
--- a/Behavioral/NullObject/Service.php
+++ b/Behavioral/NullObject/Service.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject;
 
diff --git a/Behavioral/NullObject/Tests/LoggerTest.php b/Behavioral/NullObject/Tests/LoggerTest.php
index 7dbef0d..5967494 100644
--- a/Behavioral/NullObject/Tests/LoggerTest.php
+++ b/Behavioral/NullObject/Tests/LoggerTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\NullObject\Tests;
 
diff --git a/Behavioral/Observer/Tests/ObserverTest.php b/Behavioral/Observer/Tests/ObserverTest.php
index d815fd8..87e8f90 100644
--- a/Behavioral/Observer/Tests/ObserverTest.php
+++ b/Behavioral/Observer/Tests/ObserverTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer\Tests;
 
diff --git a/Behavioral/Observer/User.php b/Behavioral/Observer/User.php
index e68ae8c..474c6e7 100644
--- a/Behavioral/Observer/User.php
+++ b/Behavioral/Observer/User.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer;
 
diff --git a/Behavioral/Observer/UserObserver.php b/Behavioral/Observer/UserObserver.php
index 357247d..4ecd107 100644
--- a/Behavioral/Observer/UserObserver.php
+++ b/Behavioral/Observer/UserObserver.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Observer;
 
diff --git a/Behavioral/Specification/AndSpecification.php b/Behavioral/Specification/AndSpecification.php
index 21a70dd..700b499 100644
--- a/Behavioral/Specification/AndSpecification.php
+++ b/Behavioral/Specification/AndSpecification.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/Item.php b/Behavioral/Specification/Item.php
index ff5d316..4daed89 100644
--- a/Behavioral/Specification/Item.php
+++ b/Behavioral/Specification/Item.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/NotSpecification.php b/Behavioral/Specification/NotSpecification.php
index a1c69bc..8e45fbc 100644
--- a/Behavioral/Specification/NotSpecification.php
+++ b/Behavioral/Specification/NotSpecification.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/OrSpecification.php b/Behavioral/Specification/OrSpecification.php
index 7f09828..722f5bd 100644
--- a/Behavioral/Specification/OrSpecification.php
+++ b/Behavioral/Specification/OrSpecification.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/PriceSpecification.php b/Behavioral/Specification/PriceSpecification.php
index 06a00cd..22aa543 100644
--- a/Behavioral/Specification/PriceSpecification.php
+++ b/Behavioral/Specification/PriceSpecification.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/Specification.php b/Behavioral/Specification/Specification.php
index 207ab44..7dda1b3 100644
--- a/Behavioral/Specification/Specification.php
+++ b/Behavioral/Specification/Specification.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification;
 
diff --git a/Behavioral/Specification/Tests/SpecificationTest.php b/Behavioral/Specification/Tests/SpecificationTest.php
index 6d11e40..78852bb 100644
--- a/Behavioral/Specification/Tests/SpecificationTest.php
+++ b/Behavioral/Specification/Tests/SpecificationTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Specification\Tests;
 
diff --git a/Behavioral/State/OrderContext.php b/Behavioral/State/OrderContext.php
index 2d9ccc2..5925225 100644
--- a/Behavioral/State/OrderContext.php
+++ b/Behavioral/State/OrderContext.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State;
 
diff --git a/Behavioral/State/State.php b/Behavioral/State/State.php
index a7ecc5c..44fce7a 100644
--- a/Behavioral/State/State.php
+++ b/Behavioral/State/State.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State;
 
diff --git a/Behavioral/State/StateCreated.php b/Behavioral/State/StateCreated.php
index 1e12b6c..6a6365f 100644
--- a/Behavioral/State/StateCreated.php
+++ b/Behavioral/State/StateCreated.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State;
 
diff --git a/Behavioral/State/StateDone.php b/Behavioral/State/StateDone.php
index f81940f..0fe0e3d 100644
--- a/Behavioral/State/StateDone.php
+++ b/Behavioral/State/StateDone.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State;
 
diff --git a/Behavioral/State/StateShipped.php b/Behavioral/State/StateShipped.php
index ea7b1ca..bfabbf0 100644
--- a/Behavioral/State/StateShipped.php
+++ b/Behavioral/State/StateShipped.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State;
 
diff --git a/Behavioral/State/Tests/StateTest.php b/Behavioral/State/Tests/StateTest.php
index 026d960..307cb21 100644
--- a/Behavioral/State/Tests/StateTest.php
+++ b/Behavioral/State/Tests/StateTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\State\Tests;
 
diff --git a/Behavioral/Strategy/Comparator.php b/Behavioral/Strategy/Comparator.php
index 4873e05..0b9733f 100644
--- a/Behavioral/Strategy/Comparator.php
+++ b/Behavioral/Strategy/Comparator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Strategy;
 
diff --git a/Behavioral/Strategy/Context.php b/Behavioral/Strategy/Context.php
index e9c7d8f..b2bcdae 100644
--- a/Behavioral/Strategy/Context.php
+++ b/Behavioral/Strategy/Context.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Strategy;
 
diff --git a/Behavioral/Strategy/DateComparator.php b/Behavioral/Strategy/DateComparator.php
index f83a8d5..1083049 100644
--- a/Behavioral/Strategy/DateComparator.php
+++ b/Behavioral/Strategy/DateComparator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Strategy;
 
diff --git a/Behavioral/Strategy/IdComparator.php b/Behavioral/Strategy/IdComparator.php
index 923964b..9b45aec 100644
--- a/Behavioral/Strategy/IdComparator.php
+++ b/Behavioral/Strategy/IdComparator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Strategy;
 
diff --git a/Behavioral/Strategy/Tests/StrategyTest.php b/Behavioral/Strategy/Tests/StrategyTest.php
index 20a5799..e19853b 100644
--- a/Behavioral/Strategy/Tests/StrategyTest.php
+++ b/Behavioral/Strategy/Tests/StrategyTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Strategy\Tests;
 
diff --git a/Behavioral/TemplateMethod/BeachJourney.php b/Behavioral/TemplateMethod/BeachJourney.php
index 2f408f7..f67f612 100644
--- a/Behavioral/TemplateMethod/BeachJourney.php
+++ b/Behavioral/TemplateMethod/BeachJourney.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\TemplateMethod;
 
diff --git a/Behavioral/TemplateMethod/CityJourney.php b/Behavioral/TemplateMethod/CityJourney.php
index 999b074..ea4b95f 100644
--- a/Behavioral/TemplateMethod/CityJourney.php
+++ b/Behavioral/TemplateMethod/CityJourney.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\TemplateMethod;
 
diff --git a/Behavioral/TemplateMethod/Journey.php b/Behavioral/TemplateMethod/Journey.php
index 9f24e54..c1fa403 100644
--- a/Behavioral/TemplateMethod/Journey.php
+++ b/Behavioral/TemplateMethod/Journey.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\TemplateMethod;
 
diff --git a/Behavioral/TemplateMethod/Tests/JourneyTest.php b/Behavioral/TemplateMethod/Tests/JourneyTest.php
index 2907f1e..733fd57 100644
--- a/Behavioral/TemplateMethod/Tests/JourneyTest.php
+++ b/Behavioral/TemplateMethod/Tests/JourneyTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\TemplateMethod\Tests;
 
diff --git a/Behavioral/Visitor/Group.php b/Behavioral/Visitor/Group.php
index 31fb970..9ed366d 100644
--- a/Behavioral/Visitor/Group.php
+++ b/Behavioral/Visitor/Group.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
diff --git a/Behavioral/Visitor/RecordingVisitor.php b/Behavioral/Visitor/RecordingVisitor.php
index cbf0b20..5c8f435 100644
--- a/Behavioral/Visitor/RecordingVisitor.php
+++ b/Behavioral/Visitor/RecordingVisitor.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
diff --git a/Behavioral/Visitor/Role.php b/Behavioral/Visitor/Role.php
index f2ea8ee..e31fdeb 100644
--- a/Behavioral/Visitor/Role.php
+++ b/Behavioral/Visitor/Role.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
diff --git a/Behavioral/Visitor/RoleVisitor.php b/Behavioral/Visitor/RoleVisitor.php
index bfaa088..9b91231 100644
--- a/Behavioral/Visitor/RoleVisitor.php
+++ b/Behavioral/Visitor/RoleVisitor.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
diff --git a/Behavioral/Visitor/Tests/VisitorTest.php b/Behavioral/Visitor/Tests/VisitorTest.php
index 6eb3d21..84750be 100644
--- a/Behavioral/Visitor/Tests/VisitorTest.php
+++ b/Behavioral/Visitor/Tests/VisitorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Tests\Visitor\Tests;
 
diff --git a/Behavioral/Visitor/User.php b/Behavioral/Visitor/User.php
index 59517cb..c1d4124 100644
--- a/Behavioral/Visitor/User.php
+++ b/Behavioral/Visitor/User.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Behavioral\Visitor;
 
diff --git a/Creational/AbstractFactory/DigitalProduct.php b/Creational/AbstractFactory/DigitalProduct.php
index 88158c2..a87b1fc 100644
--- a/Creational/AbstractFactory/DigitalProduct.php
+++ b/Creational/AbstractFactory/DigitalProduct.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
diff --git a/Creational/AbstractFactory/Product.php b/Creational/AbstractFactory/Product.php
index 54d7a26..50a186f 100644
--- a/Creational/AbstractFactory/Product.php
+++ b/Creational/AbstractFactory/Product.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
diff --git a/Creational/AbstractFactory/ProductFactory.php b/Creational/AbstractFactory/ProductFactory.php
index 94c87e3..db43b65 100644
--- a/Creational/AbstractFactory/ProductFactory.php
+++ b/Creational/AbstractFactory/ProductFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
diff --git a/Creational/AbstractFactory/ShippableProduct.php b/Creational/AbstractFactory/ShippableProduct.php
index cd6d9bc..6979311 100644
--- a/Creational/AbstractFactory/ShippableProduct.php
+++ b/Creational/AbstractFactory/ShippableProduct.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\AbstractFactory;
 
diff --git a/Creational/AbstractFactory/Tests/AbstractFactoryTest.php b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
index 1477947..890eae4 100644
--- a/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
+++ b/Creational/AbstractFactory/Tests/AbstractFactoryTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\AbstractFactory\Tests;
 
diff --git a/Creational/Builder/Builder.php b/Creational/Builder/Builder.php
index 7614942..b1c8c28 100644
--- a/Creational/Builder/Builder.php
+++ b/Creational/Builder/Builder.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder;
 
diff --git a/Creational/Builder/CarBuilder.php b/Creational/Builder/CarBuilder.php
index 539979e..f82fda2 100644
--- a/Creational/Builder/CarBuilder.php
+++ b/Creational/Builder/CarBuilder.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder;
 
diff --git a/Creational/Builder/Director.php b/Creational/Builder/Director.php
index 8ba277d..db9b696 100644
--- a/Creational/Builder/Director.php
+++ b/Creational/Builder/Director.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder;
 
diff --git a/Creational/Builder/Parts/Car.php b/Creational/Builder/Parts/Car.php
index 7f8ebfa..6c78eb8 100644
--- a/Creational/Builder/Parts/Car.php
+++ b/Creational/Builder/Parts/Car.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Parts/Door.php b/Creational/Builder/Parts/Door.php
index a0cd98c..94ca65e 100644
--- a/Creational/Builder/Parts/Door.php
+++ b/Creational/Builder/Parts/Door.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Parts/Engine.php b/Creational/Builder/Parts/Engine.php
index 572335d..8799297 100644
--- a/Creational/Builder/Parts/Engine.php
+++ b/Creational/Builder/Parts/Engine.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Parts/Truck.php b/Creational/Builder/Parts/Truck.php
index 4d82e29..8759928 100644
--- a/Creational/Builder/Parts/Truck.php
+++ b/Creational/Builder/Parts/Truck.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Parts/Vehicle.php b/Creational/Builder/Parts/Vehicle.php
index bfa848e..2cb571e 100644
--- a/Creational/Builder/Parts/Vehicle.php
+++ b/Creational/Builder/Parts/Vehicle.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Parts/Wheel.php b/Creational/Builder/Parts/Wheel.php
index 5e2920a..d7ac041 100644
--- a/Creational/Builder/Parts/Wheel.php
+++ b/Creational/Builder/Parts/Wheel.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Parts;
 
diff --git a/Creational/Builder/Tests/DirectorTest.php b/Creational/Builder/Tests/DirectorTest.php
index f83ebeb..9cce577 100644
--- a/Creational/Builder/Tests/DirectorTest.php
+++ b/Creational/Builder/Tests/DirectorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder\Tests;
 
diff --git a/Creational/Builder/TruckBuilder.php b/Creational/Builder/TruckBuilder.php
index 7debc59..92a6972 100644
--- a/Creational/Builder/TruckBuilder.php
+++ b/Creational/Builder/TruckBuilder.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Builder;
 
diff --git a/Creational/FactoryMethod/FileLogger.php b/Creational/FactoryMethod/FileLogger.php
index 4619f44..1f0a75a 100644
--- a/Creational/FactoryMethod/FileLogger.php
+++ b/Creational/FactoryMethod/FileLogger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/FileLoggerFactory.php b/Creational/FactoryMethod/FileLoggerFactory.php
index 0466ddc..409b6c7 100644
--- a/Creational/FactoryMethod/FileLoggerFactory.php
+++ b/Creational/FactoryMethod/FileLoggerFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/Logger.php b/Creational/FactoryMethod/Logger.php
index dc48e3e..8d1f451 100644
--- a/Creational/FactoryMethod/Logger.php
+++ b/Creational/FactoryMethod/Logger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/LoggerFactory.php b/Creational/FactoryMethod/LoggerFactory.php
index 6f77eff..5e5c54e 100644
--- a/Creational/FactoryMethod/LoggerFactory.php
+++ b/Creational/FactoryMethod/LoggerFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/StdoutLogger.php b/Creational/FactoryMethod/StdoutLogger.php
index 413164c..84ccbeb 100644
--- a/Creational/FactoryMethod/StdoutLogger.php
+++ b/Creational/FactoryMethod/StdoutLogger.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/StdoutLoggerFactory.php b/Creational/FactoryMethod/StdoutLoggerFactory.php
index 613fb91..fefe43c 100644
--- a/Creational/FactoryMethod/StdoutLoggerFactory.php
+++ b/Creational/FactoryMethod/StdoutLoggerFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod;
 
diff --git a/Creational/FactoryMethod/Tests/FactoryMethodTest.php b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
index 3898edb..85768db 100644
--- a/Creational/FactoryMethod/Tests/FactoryMethodTest.php
+++ b/Creational/FactoryMethod/Tests/FactoryMethodTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\FactoryMethod\Tests;
 
diff --git a/Creational/Multiton/Multiton.php b/Creational/Multiton/Multiton.php
index 21bbeed..0773ed4 100644
--- a/Creational/Multiton/Multiton.php
+++ b/Creational/Multiton/Multiton.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Multiton;
 
diff --git a/Creational/Multiton/Tests/MultitonTest.php b/Creational/Multiton/Tests/MultitonTest.php
index 624d65b..f48b1b6 100644
--- a/Creational/Multiton/Tests/MultitonTest.php
+++ b/Creational/Multiton/Tests/MultitonTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Multition\Tests;
 
diff --git a/Creational/Pool/StringReverseWorker.php b/Creational/Pool/StringReverseWorker.php
index c61c287..3cf035f 100644
--- a/Creational/Pool/StringReverseWorker.php
+++ b/Creational/Pool/StringReverseWorker.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Pool;
 
diff --git a/Creational/Pool/Tests/PoolTest.php b/Creational/Pool/Tests/PoolTest.php
index 7222f15..aa74947 100644
--- a/Creational/Pool/Tests/PoolTest.php
+++ b/Creational/Pool/Tests/PoolTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Pool\Tests;
 
diff --git a/Creational/Pool/WorkerPool.php b/Creational/Pool/WorkerPool.php
index 1d70e83..94318c9 100644
--- a/Creational/Pool/WorkerPool.php
+++ b/Creational/Pool/WorkerPool.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Pool;
 
diff --git a/Creational/Prototype/BarBookPrototype.php b/Creational/Prototype/BarBookPrototype.php
index 5b29e3e..417aac0 100644
--- a/Creational/Prototype/BarBookPrototype.php
+++ b/Creational/Prototype/BarBookPrototype.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Prototype;
 
diff --git a/Creational/Prototype/BookPrototype.php b/Creational/Prototype/BookPrototype.php
index c1d8057..8139bc7 100644
--- a/Creational/Prototype/BookPrototype.php
+++ b/Creational/Prototype/BookPrototype.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Prototype;
 
diff --git a/Creational/Prototype/FooBookPrototype.php b/Creational/Prototype/FooBookPrototype.php
index 26902a1..272c046 100644
--- a/Creational/Prototype/FooBookPrototype.php
+++ b/Creational/Prototype/FooBookPrototype.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Prototype;
 
diff --git a/Creational/Prototype/Tests/PrototypeTest.php b/Creational/Prototype/Tests/PrototypeTest.php
index 6d84ece..2d04375 100644
--- a/Creational/Prototype/Tests/PrototypeTest.php
+++ b/Creational/Prototype/Tests/PrototypeTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Prototype\Tests;
 
diff --git a/Creational/SimpleFactory/Bicycle.php b/Creational/SimpleFactory/Bicycle.php
index 0300c46..ac985ec 100644
--- a/Creational/SimpleFactory/Bicycle.php
+++ b/Creational/SimpleFactory/Bicycle.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
diff --git a/Creational/SimpleFactory/SimpleFactory.php b/Creational/SimpleFactory/SimpleFactory.php
index f28e079..5298e10 100644
--- a/Creational/SimpleFactory/SimpleFactory.php
+++ b/Creational/SimpleFactory/SimpleFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\SimpleFactory;
 
diff --git a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
index adc652c..39bb573 100644
--- a/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
+++ b/Creational/SimpleFactory/Tests/SimpleFactoryTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\SimpleFactory\Tests;
 
diff --git a/Creational/Singleton/Singleton.php b/Creational/Singleton/Singleton.php
index 09f4bf0..8c7b436 100644
--- a/Creational/Singleton/Singleton.php
+++ b/Creational/Singleton/Singleton.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Singleton;
 
diff --git a/Creational/Singleton/Tests/SingletonTest.php b/Creational/Singleton/Tests/SingletonTest.php
index 17bb63d..09b2434 100644
--- a/Creational/Singleton/Tests/SingletonTest.php
+++ b/Creational/Singleton/Tests/SingletonTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\Singleton\Tests;
 
diff --git a/Creational/StaticFactory/FormatNumber.php b/Creational/StaticFactory/FormatNumber.php
index a368d1d..98be4e8 100644
--- a/Creational/StaticFactory/FormatNumber.php
+++ b/Creational/StaticFactory/FormatNumber.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
diff --git a/Creational/StaticFactory/FormatString.php b/Creational/StaticFactory/FormatString.php
index 70e706a..5574c0b 100644
--- a/Creational/StaticFactory/FormatString.php
+++ b/Creational/StaticFactory/FormatString.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
diff --git a/Creational/StaticFactory/Formatter.php b/Creational/StaticFactory/Formatter.php
index 90787dc..74e4f3e 100644
--- a/Creational/StaticFactory/Formatter.php
+++ b/Creational/StaticFactory/Formatter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
diff --git a/Creational/StaticFactory/StaticFactory.php b/Creational/StaticFactory/StaticFactory.php
index 0b56382..268dedf 100644
--- a/Creational/StaticFactory/StaticFactory.php
+++ b/Creational/StaticFactory/StaticFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\StaticFactory;
 
diff --git a/Creational/StaticFactory/Tests/StaticFactoryTest.php b/Creational/StaticFactory/Tests/StaticFactoryTest.php
index 167402b..b289192 100644
--- a/Creational/StaticFactory/Tests/StaticFactoryTest.php
+++ b/Creational/StaticFactory/Tests/StaticFactoryTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Creational\StaticFactory\Tests;
 
diff --git a/More/EAV/Attribute.php b/More/EAV/Attribute.php
index 2ff5e47..2120753 100644
--- a/More/EAV/Attribute.php
+++ b/More/EAV/Attribute.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\EAV;
 
diff --git a/More/EAV/Entity.php b/More/EAV/Entity.php
index 1affcb5..cda0389 100644
--- a/More/EAV/Entity.php
+++ b/More/EAV/Entity.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\EAV;
 
diff --git a/More/EAV/Tests/EAVTest.php b/More/EAV/Tests/EAVTest.php
index b6c2579..79e9ac9 100644
--- a/More/EAV/Tests/EAVTest.php
+++ b/More/EAV/Tests/EAVTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\EAV\Tests;
 
diff --git a/More/EAV/Value.php b/More/EAV/Value.php
index 31f7267..4e993aa 100644
--- a/More/EAV/Value.php
+++ b/More/EAV/Value.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\EAV;
 
diff --git a/More/Repository/Domain/Post.php b/More/Repository/Domain/Post.php
index 63f2a6e..845bfeb 100644
--- a/More/Repository/Domain/Post.php
+++ b/More/Repository/Domain/Post.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository\Domain;
 
diff --git a/More/Repository/Domain/PostId.php b/More/Repository/Domain/PostId.php
index 08b202f..c1e2d18 100644
--- a/More/Repository/Domain/PostId.php
+++ b/More/Repository/Domain/PostId.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository\Domain;
 
diff --git a/More/Repository/Domain/PostStatus.php b/More/Repository/Domain/PostStatus.php
index 172a45e..61853bc 100644
--- a/More/Repository/Domain/PostStatus.php
+++ b/More/Repository/Domain/PostStatus.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository\Domain;
 
diff --git a/More/Repository/InMemoryPersistence.php b/More/Repository/InMemoryPersistence.php
index 69df0a8..ed8db64 100644
--- a/More/Repository/InMemoryPersistence.php
+++ b/More/Repository/InMemoryPersistence.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository;
 
diff --git a/More/Repository/Persistence.php b/More/Repository/Persistence.php
index de3eb7e..b1e3e26 100644
--- a/More/Repository/Persistence.php
+++ b/More/Repository/Persistence.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository;
 
diff --git a/More/Repository/PostRepository.php b/More/Repository/PostRepository.php
index e2557d4..4382e05 100644
--- a/More/Repository/PostRepository.php
+++ b/More/Repository/PostRepository.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository;
 
diff --git a/More/Repository/Tests/PostRepositoryTest.php b/More/Repository/Tests/PostRepositoryTest.php
index bff9acf..9e7203f 100644
--- a/More/Repository/Tests/PostRepositoryTest.php
+++ b/More/Repository/Tests/PostRepositoryTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\Repository\Tests;
 
diff --git a/More/ServiceLocator/LogService.php b/More/ServiceLocator/LogService.php
index a8fa10e..84c999c 100644
--- a/More/ServiceLocator/LogService.php
+++ b/More/ServiceLocator/LogService.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\ServiceLocator;
 
diff --git a/More/ServiceLocator/ServiceLocator.php b/More/ServiceLocator/ServiceLocator.php
index fe37c95..4546b5d 100644
--- a/More/ServiceLocator/ServiceLocator.php
+++ b/More/ServiceLocator/ServiceLocator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\ServiceLocator;
 
diff --git a/More/ServiceLocator/Tests/ServiceLocatorTest.php b/More/ServiceLocator/Tests/ServiceLocatorTest.php
index b3cf936..4898269 100644
--- a/More/ServiceLocator/Tests/ServiceLocatorTest.php
+++ b/More/ServiceLocator/Tests/ServiceLocatorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\More\ServiceLocator\Tests;
 
diff --git a/Structural/Adapter/Book.php b/Structural/Adapter/Book.php
index 7460131..83079d6 100644
--- a/Structural/Adapter/Book.php
+++ b/Structural/Adapter/Book.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter;
 
diff --git a/Structural/Adapter/BookInterface.php b/Structural/Adapter/BookInterface.php
index 3262f78..d79ee1b 100644
--- a/Structural/Adapter/BookInterface.php
+++ b/Structural/Adapter/BookInterface.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter;
 
diff --git a/Structural/Adapter/EBookAdapter.php b/Structural/Adapter/EBookAdapter.php
index d4b5006..08d065a 100644
--- a/Structural/Adapter/EBookAdapter.php
+++ b/Structural/Adapter/EBookAdapter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter;
 
diff --git a/Structural/Adapter/EBookInterface.php b/Structural/Adapter/EBookInterface.php
index 798495c..1249842 100644
--- a/Structural/Adapter/EBookInterface.php
+++ b/Structural/Adapter/EBookInterface.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter;
 
diff --git a/Structural/Adapter/Kindle.php b/Structural/Adapter/Kindle.php
index 500c009..03354a6 100644
--- a/Structural/Adapter/Kindle.php
+++ b/Structural/Adapter/Kindle.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter;
 
diff --git a/Structural/Adapter/Tests/AdapterTest.php b/Structural/Adapter/Tests/AdapterTest.php
index a01a90d..3b8c076 100644
--- a/Structural/Adapter/Tests/AdapterTest.php
+++ b/Structural/Adapter/Tests/AdapterTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Adapter\Tests;
 
diff --git a/Structural/Bridge/Formatter.php b/Structural/Bridge/Formatter.php
index 9eb1bb8..093dd39 100644
--- a/Structural/Bridge/Formatter.php
+++ b/Structural/Bridge/Formatter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/HelloWorldService.php b/Structural/Bridge/HelloWorldService.php
index 0e90f29..10202ab 100644
--- a/Structural/Bridge/HelloWorldService.php
+++ b/Structural/Bridge/HelloWorldService.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/HtmlFormatter.php b/Structural/Bridge/HtmlFormatter.php
index 297b5b8..b2f0a3a 100644
--- a/Structural/Bridge/HtmlFormatter.php
+++ b/Structural/Bridge/HtmlFormatter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/PingService.php b/Structural/Bridge/PingService.php
index e24fb80..f569ce6 100644
--- a/Structural/Bridge/PingService.php
+++ b/Structural/Bridge/PingService.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/PlainTextFormatter.php b/Structural/Bridge/PlainTextFormatter.php
index 969771c..f7c5935 100644
--- a/Structural/Bridge/PlainTextFormatter.php
+++ b/Structural/Bridge/PlainTextFormatter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/Service.php b/Structural/Bridge/Service.php
index 5a5aa9b..0d91e12 100644
--- a/Structural/Bridge/Service.php
+++ b/Structural/Bridge/Service.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge;
 
diff --git a/Structural/Bridge/Tests/BridgeTest.php b/Structural/Bridge/Tests/BridgeTest.php
index 32cb4db..fa05821 100644
--- a/Structural/Bridge/Tests/BridgeTest.php
+++ b/Structural/Bridge/Tests/BridgeTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Bridge\Tests;
 
diff --git a/Structural/Composite/Form.php b/Structural/Composite/Form.php
index f151df3..d3adce1 100644
--- a/Structural/Composite/Form.php
+++ b/Structural/Composite/Form.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Composite;
 
diff --git a/Structural/Composite/InputElement.php b/Structural/Composite/InputElement.php
index e6090ee..1ea4dc3 100644
--- a/Structural/Composite/InputElement.php
+++ b/Structural/Composite/InputElement.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Composite;
 
diff --git a/Structural/Composite/Renderable.php b/Structural/Composite/Renderable.php
index 647e341..1ec8eaf 100644
--- a/Structural/Composite/Renderable.php
+++ b/Structural/Composite/Renderable.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Composite;
 
diff --git a/Structural/Composite/Tests/CompositeTest.php b/Structural/Composite/Tests/CompositeTest.php
index 262eb8d..5ed321a 100644
--- a/Structural/Composite/Tests/CompositeTest.php
+++ b/Structural/Composite/Tests/CompositeTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Composite\Tests;
 
diff --git a/Structural/Composite/TextElement.php b/Structural/Composite/TextElement.php
index 26b1216..eb7f6c6 100644
--- a/Structural/Composite/TextElement.php
+++ b/Structural/Composite/TextElement.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Composite;
 
diff --git a/Structural/DataMapper/StorageAdapter.php b/Structural/DataMapper/StorageAdapter.php
index c669477..f49d0d5 100644
--- a/Structural/DataMapper/StorageAdapter.php
+++ b/Structural/DataMapper/StorageAdapter.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DataMapper;
 
diff --git a/Structural/DataMapper/Tests/DataMapperTest.php b/Structural/DataMapper/Tests/DataMapperTest.php
index 0d61ea9..79833fc 100644
--- a/Structural/DataMapper/Tests/DataMapperTest.php
+++ b/Structural/DataMapper/Tests/DataMapperTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DataMapper\Tests;
 
diff --git a/Structural/DataMapper/User.php b/Structural/DataMapper/User.php
index 2590989..4711393 100644
--- a/Structural/DataMapper/User.php
+++ b/Structural/DataMapper/User.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DataMapper;
 
diff --git a/Structural/DataMapper/UserMapper.php b/Structural/DataMapper/UserMapper.php
index 6ef2253..f68a53c 100644
--- a/Structural/DataMapper/UserMapper.php
+++ b/Structural/DataMapper/UserMapper.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DataMapper;
 
diff --git a/Structural/Decorator/Booking.php b/Structural/Decorator/Booking.php
index 453ef81..16e766c 100644
--- a/Structural/Decorator/Booking.php
+++ b/Structural/Decorator/Booking.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/Decorator/BookingDecorator.php b/Structural/Decorator/BookingDecorator.php
index cc001ad..207c2c7 100644
--- a/Structural/Decorator/BookingDecorator.php
+++ b/Structural/Decorator/BookingDecorator.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/Decorator/DoubleRoomBooking.php b/Structural/Decorator/DoubleRoomBooking.php
index aba57ac..462fb66 100644
--- a/Structural/Decorator/DoubleRoomBooking.php
+++ b/Structural/Decorator/DoubleRoomBooking.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/Decorator/ExtraBed.php b/Structural/Decorator/ExtraBed.php
index 9842cff..f7a01e7 100644
--- a/Structural/Decorator/ExtraBed.php
+++ b/Structural/Decorator/ExtraBed.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/Decorator/Tests/DecoratorTest.php b/Structural/Decorator/Tests/DecoratorTest.php
index 81ef3e3..3900936 100644
--- a/Structural/Decorator/Tests/DecoratorTest.php
+++ b/Structural/Decorator/Tests/DecoratorTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator\Tests;
 
diff --git a/Structural/Decorator/WiFi.php b/Structural/Decorator/WiFi.php
index e9944ad..58d4036 100644
--- a/Structural/Decorator/WiFi.php
+++ b/Structural/Decorator/WiFi.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Decorator;
 
diff --git a/Structural/DependencyInjection/DatabaseConfiguration.php b/Structural/DependencyInjection/DatabaseConfiguration.php
index a101229..8438472 100644
--- a/Structural/DependencyInjection/DatabaseConfiguration.php
+++ b/Structural/DependencyInjection/DatabaseConfiguration.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DependencyInjection;
 
diff --git a/Structural/DependencyInjection/DatabaseConnection.php b/Structural/DependencyInjection/DatabaseConnection.php
index 0d562d9..10061ec 100644
--- a/Structural/DependencyInjection/DatabaseConnection.php
+++ b/Structural/DependencyInjection/DatabaseConnection.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DependencyInjection;
 
diff --git a/Structural/DependencyInjection/Tests/DependencyInjectionTest.php b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
index d0c213a..75cdd71 100644
--- a/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
+++ b/Structural/DependencyInjection/Tests/DependencyInjectionTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\DependencyInjection\Tests;
 
diff --git a/Structural/Facade/Bios.php b/Structural/Facade/Bios.php
index 6c9c816..6c1a59a 100644
--- a/Structural/Facade/Bios.php
+++ b/Structural/Facade/Bios.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade;
 
diff --git a/Structural/Facade/Facade.php b/Structural/Facade/Facade.php
index 28e2d2f..22d03ff 100644
--- a/Structural/Facade/Facade.php
+++ b/Structural/Facade/Facade.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade;
 
diff --git a/Structural/Facade/OperatingSystem.php b/Structural/Facade/OperatingSystem.php
index 9aa7247..66d0c85 100644
--- a/Structural/Facade/OperatingSystem.php
+++ b/Structural/Facade/OperatingSystem.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade;
 
diff --git a/Structural/Facade/Tests/FacadeTest.php b/Structural/Facade/Tests/FacadeTest.php
index 14d2bc6..568c27d 100644
--- a/Structural/Facade/Tests/FacadeTest.php
+++ b/Structural/Facade/Tests/FacadeTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade\Tests;
 
diff --git a/Structural/FluentInterface/Sql.php b/Structural/FluentInterface/Sql.php
index c8813f4..2dd6b95 100644
--- a/Structural/FluentInterface/Sql.php
+++ b/Structural/FluentInterface/Sql.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\FluentInterface;
 
diff --git a/Structural/FluentInterface/Tests/FluentInterfaceTest.php b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
index 700674a..fb0010d 100644
--- a/Structural/FluentInterface/Tests/FluentInterfaceTest.php
+++ b/Structural/FluentInterface/Tests/FluentInterfaceTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\FluentInterface\Tests;
 
diff --git a/Structural/Flyweight/Character.php b/Structural/Flyweight/Character.php
index 9441388..169b1ff 100644
--- a/Structural/Flyweight/Character.php
+++ b/Structural/Flyweight/Character.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Flyweight;
 
diff --git a/Structural/Flyweight/Tests/FlyweightTest.php b/Structural/Flyweight/Tests/FlyweightTest.php
index 6133150..ed10951 100644
--- a/Structural/Flyweight/Tests/FlyweightTest.php
+++ b/Structural/Flyweight/Tests/FlyweightTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Flyweight\Tests;
 
diff --git a/Structural/Flyweight/Text.php b/Structural/Flyweight/Text.php
index f7fbb5f..20bf738 100644
--- a/Structural/Flyweight/Text.php
+++ b/Structural/Flyweight/Text.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Flyweight;
 
diff --git a/Structural/Flyweight/TextFactory.php b/Structural/Flyweight/TextFactory.php
index c954d3a..2ba37b1 100644
--- a/Structural/Flyweight/TextFactory.php
+++ b/Structural/Flyweight/TextFactory.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Flyweight;
 
diff --git a/Structural/Proxy/BankAccount.php b/Structural/Proxy/BankAccount.php
index 4da6afb..e10a3cc 100644
--- a/Structural/Proxy/BankAccount.php
+++ b/Structural/Proxy/BankAccount.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Proxy;
 
diff --git a/Structural/Proxy/BankAccountProxy.php b/Structural/Proxy/BankAccountProxy.php
index 6bfce7f..edd76ea 100644
--- a/Structural/Proxy/BankAccountProxy.php
+++ b/Structural/Proxy/BankAccountProxy.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Proxy;
 
diff --git a/Structural/Proxy/HeavyBankAccount.php b/Structural/Proxy/HeavyBankAccount.php
index d73a391..37aa0ca 100644
--- a/Structural/Proxy/HeavyBankAccount.php
+++ b/Structural/Proxy/HeavyBankAccount.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Proxy;
 
diff --git a/Structural/Proxy/Tests/ProxyTest.php b/Structural/Proxy/Tests/ProxyTest.php
index 56269b7..8ecb753 100644
--- a/Structural/Proxy/Tests/ProxyTest.php
+++ b/Structural/Proxy/Tests/ProxyTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Proxy\Tests;
 
diff --git a/Structural/Registry/Registry.php b/Structural/Registry/Registry.php
index 08161e7..b700826 100644
--- a/Structural/Registry/Registry.php
+++ b/Structural/Registry/Registry.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Registry;
 
diff --git a/Structural/Registry/Tests/RegistryTest.php b/Structural/Registry/Tests/RegistryTest.php
index 8507686..94f7e44 100644
--- a/Structural/Registry/Tests/RegistryTest.php
+++ b/Structural/Registry/Tests/RegistryTest.php
@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Registry\Tests;