diff --git a/src/Controller/Blog/Api/CommentController.php b/src/Controller/Blog/Api/CommentController.php
index a247d59..f673ea4 100644
--- a/src/Controller/Blog/Api/CommentController.php
+++ b/src/Controller/Blog/Api/CommentController.php
@@ -2,12 +2,11 @@
 
 namespace App\Controller\Blog\Api;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use App\Markdown\Parser\Comment as CommentParser;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 class CommentController extends AbstractController
 {
diff --git a/src/Controller/Blog/CommentAdminController.php b/src/Controller/Blog/CommentAdminController.php
index 2b14f7c..0b972a5 100644
--- a/src/Controller/Blog/CommentAdminController.php
+++ b/src/Controller/Blog/CommentAdminController.php
@@ -5,9 +5,8 @@ namespace App\Controller\Blog;
 use App\Core\Controller\Admin\AdminController;
 use App\Core\Manager\EntityManager;
 use App\Entity\Blog\Comment as Entity;
-use App\Factory\Blog\CommentFactory as EntityFactory;
-use App\Form\Blog\Filter\CommentFilterType;
 use App\Form\Blog\CommentType as EntityType;
+use App\Form\Blog\Filter\CommentFilterType;
 use App\Repository\Blog\CommentRepositoryQuery as RepositoryQuery;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Factory/Blog/CommentFactory.php b/src/Factory/Blog/CommentFactory.php
index 520f143..9ce5cbb 100644
--- a/src/Factory/Blog/CommentFactory.php
+++ b/src/Factory/Blog/CommentFactory.php
@@ -18,7 +18,8 @@ class CommentFactory
 
         $entity
             ->setPost($post)
-            ->setIsActive(true);
+            ->setIsActive(true)
+        ;
 
         return $entity;
     }
diff --git a/src/Form/Blog/CommentType.php b/src/Form/Blog/CommentType.php
index dc6f12e..0c3b7ce 100644
--- a/src/Form/Blog/CommentType.php
+++ b/src/Form/Blog/CommentType.php
@@ -3,7 +3,12 @@
 namespace App\Form\Blog;
 
 use App\Entity\Blog\Comment;
+use App\Entity\Blog\Post;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
@@ -12,12 +17,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Url;
-use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use App\Entity\Blog\Post;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 
 class CommentType extends AbstractType
 {
diff --git a/src/Form/Blog/Filter/CommentFilterType.php b/src/Form/Blog/Filter/CommentFilterType.php
index c96efad..a85f34e 100644
--- a/src/Form/Blog/Filter/CommentFilterType.php
+++ b/src/Form/Blog/Filter/CommentFilterType.php
@@ -2,14 +2,13 @@
 
 namespace App\Form\Blog\Filter;
 
+use App\Entity\Blog\Post;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use App\Entity\Blog\Post;
-use Symfony\Component\Form\ChoiceList\ChoiceList;
 
 class CommentFilterType extends AbstractType
 {
diff --git a/src/Form/Blog/Filter/PostFilterType.php b/src/Form/Blog/Filter/PostFilterType.php
index c15434d..47c8e2d 100644
--- a/src/Form/Blog/Filter/PostFilterType.php
+++ b/src/Form/Blog/Filter/PostFilterType.php
@@ -10,7 +10,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\ChoiceList\ChoiceList;
 
 class PostFilterType extends AbstractType
 {
diff --git a/src/Form/Blog/UserCommentType.php b/src/Form/Blog/UserCommentType.php
index b72674b..cd365e0 100644
--- a/src/Form/Blog/UserCommentType.php
+++ b/src/Form/Blog/UserCommentType.php
@@ -4,6 +4,8 @@ namespace App\Form\Blog;
 
 use App\Entity\Blog\Comment;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
@@ -12,8 +14,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Url;
-use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 class UserCommentType extends AbstractType
 {
diff --git a/src/Repository/Blog/CommentRepositoryQuery.php b/src/Repository/Blog/CommentRepositoryQuery.php
index 5838af6..5590979 100644
--- a/src/Repository/Blog/CommentRepositoryQuery.php
+++ b/src/Repository/Blog/CommentRepositoryQuery.php
@@ -34,7 +34,8 @@ class CommentRepositoryQuery extends RepositoryQuery
                 if ('post' === $name) {
                     $this
                         ->andWhere('.post = :postId')
-                        ->setParameter(':postId', $value->getId());
+                        ->setParameter(':postId', $value->getId())
+                    ;
                 }
             }
         }