diff --git a/flextype/twig/CsrfTwigExtension.php b/flextype/twig/CsrfTwigExtension.php
index f6c655d9..efcaafe4 100644
--- a/flextype/twig/CsrfTwigExtension.php
+++ b/flextype/twig/CsrfTwigExtension.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace Flextype;
 
-use Slim\Csrf\Guard;
 use Twig_Extension;
 use Twig_Extension_GlobalsInterface;
 use Twig_SimpleFunction;
diff --git a/flextype/twig/DateTwigExtension.php b/flextype/twig/DateTwigExtension.php
index 57406cf6..98bf677b 100644
--- a/flextype/twig/DateTwigExtension.php
+++ b/flextype/twig/DateTwigExtension.php
@@ -87,12 +87,14 @@ class DateTwigExtension extends Twig_Extension
                 } else {
                     $js_format .= '\'' . $php_format[$i];
                 }
+
                 $escaping = true;
             } else {
                 if ($escaping) {
                     $js_format .= "'";
                     $escaping   = false;
                 }
+
                 if (isset($symbols_matching[$char])) {
                     $js_format .= $symbols_matching[$char];
                 } else {
diff --git a/flextype/twig/I18nTwigExtension.php b/flextype/twig/I18nTwigExtension.php
index 28883085..631fc0b3 100644
--- a/flextype/twig/I18nTwigExtension.php
+++ b/flextype/twig/I18nTwigExtension.php
@@ -43,7 +43,7 @@ class I18nTwigExtension extends Twig_Extension
     /**
      * Translate string
      */
-    public function tr(string $translate, array $values = [], string $locale = null) : string
+    public function tr(string $translate, array $values = [], ?string $locale = null) : string
     {
         return I18n::find($translate, $values, $locale);
     }
diff --git a/flextype/twig/JsonTwigExtension.php b/flextype/twig/JsonTwigExtension.php
index e934d19d..1d3e04d8 100644
--- a/flextype/twig/JsonTwigExtension.php
+++ b/flextype/twig/JsonTwigExtension.php
@@ -10,8 +10,8 @@ declare(strict_types=1);
 namespace Flextype;
 
 use Twig_Extension;
-use Twig_SimpleFunction;
 use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 
 class JsonTwigExtension extends Twig_Extension
 {
diff --git a/flextype/twig/YamlTwigExtension.php b/flextype/twig/YamlTwigExtension.php
index a458fffe..4b86c419 100644
--- a/flextype/twig/YamlTwigExtension.php
+++ b/flextype/twig/YamlTwigExtension.php
@@ -10,8 +10,8 @@ declare(strict_types=1);
 namespace Flextype;
 
 use Twig_Extension;
-use Twig_SimpleFunction;
 use Twig_SimpleFilter;
+use Twig_SimpleFunction;
 
 class YamlTwigExtension extends Twig_Extension
 {