diff --git a/.php_cs b/.php_cs
index ff96ac7..3518e7e 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,38 +1,132 @@
 <?php
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-->in(__DIR__);
 
-$config = Symfony\CS\Config\Config::create()
-->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-->finder($finder)
-->fixers(
-    [
-        'extra_empty_lines',
-        'no_blank_lines_after_class_opening',
-        'no_empty_lines_after_phpdocs',
-        'operators_spaces',
-        'duplicate_semicolon',
-        'namespace_no_leading_whitespace',
-        'phpdoc_indent',
-        'phpdoc_no_empty_return',
-        'phpdoc_no_package',
-        'phpdoc_params',
-        'phpdoc_separation',
-        'phpdoc_to_comment',
-        'phpdoc_trim',
-        'phpdoc_var_without_name',
-        'remove_leading_slash_use',
-        'remove_lines_between_uses',
-        'return',
-        'single_array_no_trailing_comma',
-        'single_quote',
-        'spaces_before_semicolon',
-        'spaces_cast',
-        'standardize_not_equal',
-        'ternary_spaces',
-        'whitespacy_lines',
-        'ordered_use',
-        'short_array_syntax'
-    ]
-);
-return $config;
+$header = <<<'EOF'
+This file is part of the Ray.WebFormModule package.
+
+@license http://opensource.org/licenses/MIT MIT
+EOF;
+
+return \PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@PSR2' => true,
+        'header_comment' => ['header' => $header, 'commentType' => 'PHPDoc', 'separate' => 'none'],
+        'array_syntax' => ['syntax' => 'short'],
+        'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => false],
+        'blank_line_after_opening_tag' => true,
+        'blank_line_after_namespace' => false,
+        'blank_line_before_return' => true,
+        'cast_spaces' => true,
+//        'class_keyword_remove' => true,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false,
+        'dir_constant' => true,
+        'ereg_to_preg' => true,
+        'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => true,
+        'hash_to_slash_comment' => true,
+        'heredoc_to_nowdoc' => true,
+        'include' => true,
+        'indentation_type' => true,
+        'is_null' => ['use_yoda_style' => false],
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+//        'mb_str_functions' => true,
+        'method_separation' => true,
+        'modernize_types_casting' => true,
+        'native_function_casing' => true,
+//        'native_function_invocation' => true,
+        'new_with_braces' => false, //
+        'no_alias_functions' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_blank_lines_before_namespace' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'curly_brace_block', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'throw', 'use', 'useTrait'],
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => ['use' => 'echo'],
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_php4_constructor' => false,
+        'no_short_bool_cast' => true,
+        'no_short_echo_tag' => false,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_around_offset' => true,
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false,
+        'not_operator_with_successor_space' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_strict' => true,
+//        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_align' => true,
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_inline_tag' => true,
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => ['property-read' => 'property', 'property-write' => 'property', 'type' => 'var'],
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+//        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+//        'phpdoc_summary' => true,
+        'phpdoc_to_comment' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+//        'pre_increment' => true,
+        'protected_to_private' => true,
+        'psr0' => true,
+        'psr4' => true,
+        'random_api_migration' => true,
+        'return_type_declaration' =>  ['space_before' => 'one'],
+        'self_accessor' => true,
+        'short_scalar_cast' => true,
+//        'silenced_deprecation_error' => true,
+//        'simplified_null_return' => true,
+//        'single_blank_line_before_namespace' => true,
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+//        'strict_comparison' => true,
+        'ternary_operator_spaces' => true,
+        'strict_param' => true,
+//        'ternary_to_null_coalescing' => true,
+//        'trailing_comma_in_multiline_array' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'whitespace_after_comma_in_array' => true
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('tests/Fake')
+            ->exclude('src-data')
+            ->exclude('src-deprecated')
+            ->in(__DIR__)
+    )->setLineEnding("\n")
+    ->setUsingCache(false);
diff --git a/.travis.yml b/.travis.yml
index 23cf9fe..9c343aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,24 @@
 language: php
-
+sudo: false
 php:
-  - 5.5
   - 5.6
-  - hhvm
   - 7
-
-install: travis_retry composer install --no-interaction --prefer-source
-
+  - 7.1
+  - hhvm
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+env:
+  matrix:
+    - DEPENDENCIES=""
+    - DEPENDENCIES="--prefer-lowest --prefer-stable"
+before_script:
+  - composer self-update
+  - composer update $DEPENDENCIES
 script:
- - if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then phpunit; fi
- - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
+  - ./vendor/bin/phpunit --coverage-clover=coverage.clover;
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php php-cs-fixer-v2.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
 
 after_script:
- - wget https://scrutinizer-ci.com/ocular.phar
- - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/composer.json b/composer.json
index b4f65fe..402e186 100644
--- a/composer.json
+++ b/composer.json
@@ -6,11 +6,14 @@
         "Ray.Di module"
     ],
     "require": {
-        "ray/di": "^2.0",
-        "foa/filter-input-bundle": "^1.1@dev",
-        "aura/filter": "^2.0@dev",
+        "ray/di": "^2.5",
+        "aura/input": "^1.2",
+        "aura/filter": "^2.3",
         "aura/html": "^2.4",
-        "ray/aura-session-module": "~1.0"
+        "ray/aura-session-module": "^1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.13"
     },
     "license": "MIT",
     "autoload":{
@@ -20,8 +23,13 @@
     },
     "autoload-dev":{
         "psr-4":{
-            "Ray\\WebFormModule\\": "tests/",
-            "Ray\\WebFormModule\\": "tests/Fake"
+            "Ray\\WebFormModule\\": ["tests/", "tests/Fake"]
         }
+    },
+    "scripts" :{
+        "test": ["@cs", "phpunit"],
+        "coverage": ["php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
+        "cs": ["php-cs-fixer fix -v --dry-run", "phpcs --standard=./phpcs.xml src"],
+        "cs-fix": ["php-cs-fixer fix -v", "phpcbf src"]
     }
 }
diff --git a/docs/demo/1.csrf/ContactForm.php b/docs/demo/1.csrf/ContactForm.php
index f3fe1af..ce91165 100644
--- a/docs/demo/1.csrf/ContactForm.php
+++ b/docs/demo/1.csrf/ContactForm.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Aura\Input\Filter;
@@ -8,6 +12,35 @@ class ContactForm extends AbstractAuraForm
 {
     use SetAntiCsrfTrait;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        $form = $this->form();
+        // name
+        $form .= $this->helper->tag('div', ['class' => 'form-group']);
+        $form .= $this->helper->tag('label', ['for' => 'name']);
+        $form .= 'Name:';
+        $form .= $this->helper->tag('/label') . PHP_EOL;
+        $form .= $this->input('name');
+        $form .= $this->error('name');
+        $form .= $this->helper->tag('/div') . PHP_EOL;
+        // message
+        $form .= $this->helper->tag('div', ['class' => 'form-group']);
+        $form .= $this->helper->tag('label', ['for' => 'message']);
+        $form .= 'Message:';
+        $form .= $this->helper->tag('/label') . PHP_EOL;
+        $form .= $this->input('message');
+        $form .= $this->error('message');
+        $form .= $this->helper->tag('/div') . PHP_EOL;
+        // submit
+        $form .= $this->input('submit');
+        $form .= $this->helper->tag('/form');
+
+        return $form;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -60,33 +93,4 @@ public function submit()
     {
         return $_POST;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $form = $this->form();
-        // name
-        $form .= $this->helper->tag('div', ['class' => 'form-group']);
-        $form .= $this->helper->tag('label', ['for' => 'name']);
-        $form .= 'Name:';
-        $form .= $this->helper->tag('/label') . PHP_EOL;
-        $form .= $this->input('name');
-        $form .= $this->error('name');
-        $form .= $this->helper->tag('/div') . PHP_EOL;
-        // message
-        $form .= $this->helper->tag('div', ['class' => 'form-group']);
-        $form .= $this->helper->tag('label', ['for' => 'message']);
-        $form .= 'Message:';
-        $form .= $this->helper->tag('/label') . PHP_EOL;
-        $form .= $this->input('message');
-        $form .= $this->error('message');
-        $form .= $this->helper->tag('/div') . PHP_EOL;
-        // submit
-        $form .= $this->input('submit');
-        $form .= $this->helper->tag('/form');
-
-        return $form;
-    }
 }
diff --git a/docs/demo/1.csrf/Controller.php b/docs/demo/1.csrf/Controller.php
index f0ee5eb..f17209a 100644
--- a/docs/demo/1.csrf/Controller.php
+++ b/docs/demo/1.csrf/Controller.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Ray\Di\Di\Inject;
diff --git a/docs/demo/1.csrf/MyModule.php b/docs/demo/1.csrf/MyModule.php
index a424422..295da43 100644
--- a/docs/demo/1.csrf/MyModule.php
+++ b/docs/demo/1.csrf/MyModule.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Ray\Di\AbstractModule;
diff --git a/docs/demo/1.csrf/run.php b/docs/demo/1.csrf/run.php
index c172253..81e7c17 100644
--- a/docs/demo/1.csrf/run.php
+++ b/docs/demo/1.csrf/run.php
@@ -1,6 +1,9 @@
 <?php
-
-/* @var $loader \Composer\Autoload\ClassLoader */
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 $loader = require dirname(__DIR__) . '/autoload.php';
 $loader->addPsr4('Ray\WebFormModule\\', __DIR__);
 use Aura\Input\Exception\CsrfViolation;
@@ -14,7 +17,7 @@
 try {
     $controller->createUser(['name' => 'bear', 'message' => 'hello']);
 } catch (CsrfViolation $e) {
-    echo 'Anti CSRF works !'. PHP_EOL;
+    echo 'Anti CSRF works !' . PHP_EOL;
     exit;
 }
 echo 'Anti CSRF DOES NOT works !' . PHP_EOL;
diff --git a/docs/demo/1.csrf/web.php b/docs/demo/1.csrf/web.php
index ef72c18..5bf307b 100644
--- a/docs/demo/1.csrf/web.php
+++ b/docs/demo/1.csrf/web.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use Ray\Di\Injector;
 use Ray\WebFormModule\Controller;
 use Ray\WebFormModule\MyModule;
diff --git a/docs/demo/autoload.php b/docs/demo/autoload.php
index 062240c..a0a9576 100644
--- a/docs/demo/autoload.php
+++ b/docs/demo/autoload.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 $autoloader = dirname(dirname(__DIR__)) . '/vendor/autoload.php';
diff --git a/phpcs.xml b/phpcs.xml
index 76dc14b..88ecf9b 100755
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,6 +8,7 @@
     <rule ref="PSR2">
         <exclude name="Generic.Files.LineLength"/>
     </rule>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
     <rule ref="PEAR.Commenting.FunctionComment">
         <exclude name="PEAR.Commenting.FunctionComment.MissingReturn"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamComment"/>
diff --git a/phpmd.xml b/phpmd.xml
index bd342f1..0412e29 100644
--- a/phpmd.xml
+++ b/phpmd.xml
@@ -1,9 +1,7 @@
-<ruleset
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <description>PHP.Skeleton rule set</description>
     <!--codesize-->
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
     <rule ref="rulesets/codesize.xml/NPathComplexity" />
diff --git a/src/AbstractForm.php b/src/AbstractForm.php
index d3ddc98..3ab127e 100644
--- a/src/AbstractForm.php
+++ b/src/AbstractForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
@@ -37,6 +37,16 @@ abstract class AbstractForm extends Fieldset implements FormInterface
      */
     protected $antiCsrf;
 
+    public function __construct()
+    {
+    }
+
+    public function __clone()
+    {
+        $this->filter = clone $this->filter;
+        $this->init();
+    }
+
     /**
      * @param BuilderInterface     $builder
      * @param FilterFactory        $filterFactory
@@ -49,15 +59,11 @@ public function setBaseDependencies(
         FilterFactory $filterFactory,
         HelperLocatorFactory $helperFactory
     ) {
-        $this->builder  = $builder;
+        $this->builder = $builder;
         $this->filter = $filterFactory->newSubjectFilter();
         $this->helper = $helperFactory->newInstance();
     }
 
-    public function __construct()
-    {
-    }
-
     public function setAntiCsrf(AntiCsrfInterface $antiCsrf)
     {
         $this->antiCsrf = $antiCsrf;
@@ -75,7 +81,7 @@ public function postConstruct()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function input($input)
     {
@@ -83,7 +89,7 @@ public function input($input)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function error($input)
     {
@@ -102,12 +108,12 @@ public function error($input)
     }
 
     /**
-     * @param array $attr Attributes for the form tag.
-     *
-     * @return string
+     * @param array $attr attributes for the form tag
      *
      * @throws \Aura\Html\Exception\HelperNotFound
      * @throws \Aura\Input\Exception\NoSuchInput
+     *
+     * @return string
      */
     public function form($attr = [])
     {
@@ -124,8 +130,9 @@ public function form($attr = [])
      *
      * @param array $data
      *
-     * @return bool
      * @throws CsrfViolationException
+     *
+     * @return bool
      */
     public function apply(array $data)
     {
@@ -159,10 +166,4 @@ public function getIterator()
     {
         return new \ArrayIterator($this->inputs);
     }
-
-    public function __clone()
-    {
-        $this->filter = clone $this->filter;
-        $this->init();
-    }
 }
diff --git a/src/Annotation/AbstractValidation.php b/src/Annotation/AbstractValidation.php
index b9daa11..3cf5e2f 100644
--- a/src/Annotation/AbstractValidation.php
+++ b/src/Annotation/AbstractValidation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Annotation/FormValidation.php b/src/Annotation/FormValidation.php
index 6064445..2640582 100644
--- a/src/Annotation/FormValidation.php
+++ b/src/Annotation/FormValidation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Annotation/InputValidation.php b/src/Annotation/InputValidation.php
index b63e12d..424e84d 100644
--- a/src/Annotation/InputValidation.php
+++ b/src/Annotation/InputValidation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Annotation/VndError.php b/src/Annotation/VndError.php
index e8ab370..8acdcde 100644
--- a/src/Annotation/VndError.php
+++ b/src/Annotation/VndError.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/AntiCsrf.php b/src/AntiCsrf.php
index 5d6377f..478ec0e 100644
--- a/src/AntiCsrf.php
+++ b/src/AntiCsrf.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/AuraInputInterceptor.php b/src/AuraInputInterceptor.php
index 5885271..48a38d0 100644
--- a/src/AuraInputInterceptor.php
+++ b/src/AuraInputInterceptor.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule;
 
@@ -57,6 +57,21 @@ public function invoke(MethodInvocation $invocation)
         return $this->failureHandler->handle($formValidation, $invocation, $form);
     }
 
+    /**
+     * @param array        $submit
+     * @param AbstractForm $form
+     *
+     * @throws Exception\CsrfViolationException
+     *
+     * @return bool
+     */
+    public function isValid(array $submit, AbstractForm $form)
+    {
+        $isValid = $form->apply($submit);
+
+        return $isValid;
+    }
+
     /**
      * Return arguments as named arguments.
      *
@@ -81,20 +96,6 @@ private function getNamedArguments(MethodInvocation $invocation)
         return $submit;
     }
 
-    /**
-     * @param array        $submit
-     * @param AbstractForm $form
-     *
-     * @return bool
-     * @throws Exception\CsrfViolationException
-     */
-    public function isValid(array $submit, AbstractForm $form)
-    {
-        $isValid = $form->apply($submit);
-
-        return $isValid;
-    }
-
     /**
      * Return form property
      *
diff --git a/src/AuraInputModule.php b/src/AuraInputModule.php
index 3d9819a..738c346 100644
--- a/src/AuraInputModule.php
+++ b/src/AuraInputModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/Exception/CsrfViolationException.php b/src/Exception/CsrfViolationException.php
index 5a396aa..c1daeca 100644
--- a/src/Exception/CsrfViolationException.php
+++ b/src/Exception/CsrfViolationException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php MIT
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index f11293c..b341e10 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 27bd15c..8f814ad 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/InvalidFormPropertyException.php b/src/Exception/InvalidFormPropertyException.php
index c5239ee..33e3bee 100644
--- a/src/Exception/InvalidFormPropertyException.php
+++ b/src/Exception/InvalidFormPropertyException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/InvalidOnFailureMethod.php b/src/Exception/InvalidOnFailureMethod.php
index 19920c2..c6a770a 100644
--- a/src/Exception/InvalidOnFailureMethod.php
+++ b/src/Exception/InvalidOnFailureMethod.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
index 63414ba..2b4706e 100644
--- a/src/Exception/LogicException.php
+++ b/src/Exception/LogicException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index a73e996..4fff992 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/Exception/ValidationException.php b/src/Exception/ValidationException.php
index 17dfcbc..f5d6993 100644
--- a/src/Exception/ValidationException.php
+++ b/src/Exception/ValidationException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule\Exception;
 
diff --git a/src/FailureHandlerInterface.php b/src/FailureHandlerInterface.php
index 4e37b51..1da0e22 100644
--- a/src/FailureHandlerInterface.php
+++ b/src/FailureHandlerInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/FormFactory.php b/src/FormFactory.php
index 01ab6db..8483547 100644
--- a/src/FormFactory.php
+++ b/src/FormFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/FormInterface.php b/src/FormInterface.php
index 8d63aca..4be67a8 100644
--- a/src/FormInterface.php
+++ b/src/FormInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
@@ -13,9 +13,9 @@ interface FormInterface
      *
      * @param string $input
      *
-     * @return string
-     *
      * @throws \Aura\Input\Exception\NoSuchInput
+     *
+     * @return string
      */
     public function input($input);
 
diff --git a/src/FormValidationError.php b/src/FormValidationError.php
index 09c7f2a..49ceb92 100644
--- a/src/FormValidationError.php
+++ b/src/FormValidationError.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/FormVndErrorModule.php b/src/FormVndErrorModule.php
index 46e6fe7..b3bbf5d 100644
--- a/src/FormVndErrorModule.php
+++ b/src/FormVndErrorModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/InputValidationInterceptor.php b/src/InputValidationInterceptor.php
index 09a4b09..0e29a57 100644
--- a/src/InputValidationInterceptor.php
+++ b/src/InputValidationInterceptor.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
- * @license http://opensource.org/licenses/bsd-license.php BSD
+ * @license http://opensource.org/licenses/MIT MIT
  */
 namespace Ray\WebFormModule;
 
diff --git a/src/OnFailureMethodHandler.php b/src/OnFailureMethodHandler.php
index 2fe91f9..67c214d 100644
--- a/src/OnFailureMethodHandler.php
+++ b/src/OnFailureMethodHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/SetAntiCsrfTrait.php b/src/SetAntiCsrfTrait.php
index e1b1af2..2d7b289 100644
--- a/src/SetAntiCsrfTrait.php
+++ b/src/SetAntiCsrfTrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/SubmitInterface.php b/src/SubmitInterface.php
index 8cc12dd..647277d 100644
--- a/src/SubmitInterface.php
+++ b/src/SubmitInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
diff --git a/src/VndErrorHandler.php b/src/VndErrorHandler.php
index d72e5d2..09a3383 100644
--- a/src/VndErrorHandler.php
+++ b/src/VndErrorHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file is part of the Ray.WebFormModule package
+ * This file is part of the Ray.WebFormModule package.
  *
  * @license http://opensource.org/licenses/MIT MIT
  */
@@ -31,7 +31,7 @@ public function handle(AbstractValidation $formValidation, MethodInvocation $inv
     {
         unset($formValidation);
         $vndError = $this->reader->getMethodAnnotation($invocation->getMethod(), VndError::class);
-        $error =  new FormValidationError($this->makeVndError($form, $vndError));
+        $error = new FormValidationError($this->makeVndError($form, $vndError));
         $e = new ValidationException('Validation failed.', 400, null, $error);
 
         throw $e;
diff --git a/tests/AbstractAuraFormTest.php b/tests/AbstractAuraFormTest.php
index 33ae3be..ecc9068 100644
--- a/tests/AbstractAuraFormTest.php
+++ b/tests/AbstractAuraFormTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 class AbstractAuraFormTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/AbstractFormTest.php b/tests/AbstractFormTest.php
index 5d5d893..e261ac1 100644
--- a/tests/AbstractFormTest.php
+++ b/tests/AbstractFormTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Aura\Session\CsrfTokenFactory;
diff --git a/tests/AntiCsrfTest.php b/tests/AntiCsrfTest.php
index 2242dce..a20bc94 100644
--- a/tests/AntiCsrfTest.php
+++ b/tests/AntiCsrfTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Aura\Input\Builder;
@@ -32,16 +36,6 @@ protected function setUp()
         $this->antiCsrf = new AntiCsrf($this->newSession([]), false, [AntiCsrf::TOKEN_KEY => AntiCsrf::TEST_TOKEN]);
     }
 
-    protected function newSession(array $cookies = [])
-    {
-        return new Session(
-            new SegmentFactory,
-            new CsrfTokenFactory(new Randval(new Phpfunc())),
-            $this->phpfunc,
-            $cookies
-        );
-    }
-
     public function testNew()
     {
         $this->assertInstanceOf(AntiCsrf::class, $this->antiCsrf);
@@ -58,4 +52,14 @@ public function testIsValid()
         $data = [AntiCsrf::TOKEN_KEY => $this->session->getCsrfToken()->getValue()];
         $this->assertTrue($this->antiCsrf->isValid($data));
     }
+
+    protected function newSession(array $cookies = [])
+    {
+        return new Session(
+            new SegmentFactory,
+            new CsrfTokenFactory(new Randval(new Phpfunc())),
+            $this->phpfunc,
+            $cookies
+        );
+    }
 }
diff --git a/tests/AuraInputInterceptorTest.php b/tests/AuraInputInterceptorTest.php
index a046464..400bb63 100644
--- a/tests/AuraInputInterceptorTest.php
+++ b/tests/AuraInputInterceptorTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Doctrine\Common\Annotations\AnnotationReader;
diff --git a/tests/AuraInputModuleTest.php b/tests/AuraInputModuleTest.php
index 52e6dcd..97ff88d 100644
--- a/tests/AuraInputModuleTest.php
+++ b/tests/AuraInputModuleTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Ray\Aop\WeavedInterface;
diff --git a/tests/FormFactoryTest.php b/tests/FormFactoryTest.php
index 96fe20e..07451e3 100644
--- a/tests/FormFactoryTest.php
+++ b/tests/FormFactoryTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 class FormFactoryTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/VndErrorHandlerTest.php b/tests/VndErrorHandlerTest.php
index 2906605..80519d7 100644
--- a/tests/VndErrorHandlerTest.php
+++ b/tests/VndErrorHandlerTest.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Ray\WebFormModule;
 
 use Ray\Di\Injector;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6c333a6..ba7dfce 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /* @var $loader \Composer\Autoload\ClassLoader */