diff --git a/src/Entity/BlockContent.php b/src/Entity/BlockContent.php
index b0db2f7b..7a451924 100644
--- a/src/Entity/BlockContent.php
+++ b/src/Entity/BlockContent.php
@@ -12,13 +12,13 @@
 
 final class BlockContent implements BlockContentInterface
 {
-    protected ?int $id;
+    private ?int $id;
 
-    protected ?string $type;
+    private ?string $type;
 
-    protected array $configuration = [];
+    private array $configuration = [];
 
-    protected ?BlockInterface $block = null;
+    private ?BlockInterface $block = null;
 
     public function getId(): ?int
     {
diff --git a/src/Entity/LocaleAwareInterface.php b/src/Entity/LocaleAwareInterface.php
index 80d4aeef..0cd3117e 100644
--- a/src/Entity/LocaleAwareInterface.php
+++ b/src/Entity/LocaleAwareInterface.php
@@ -6,7 +6,6 @@
  * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career
 */
 
-
 declare(strict_types=1);
 
 namespace BitBag\SyliusCmsPlugin\Entity;
diff --git a/src/Entity/LocaleAwareTrait.php b/src/Entity/LocaleAwareTrait.php
index 9ba37728..14215f58 100644
--- a/src/Entity/LocaleAwareTrait.php
+++ b/src/Entity/LocaleAwareTrait.php
@@ -6,7 +6,6 @@
  * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career
 */
 
-
 declare(strict_types=1);
 
 namespace BitBag\SyliusCmsPlugin\Entity;
diff --git a/src/Form/Type/BlockContentType.php b/src/Form/Type/BlockContentType.php
index c4296b1c..3b50456a 100644
--- a/src/Form/Type/BlockContentType.php
+++ b/src/Form/Type/BlockContentType.php
@@ -65,7 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 $form = $event->getForm();
                 $formData = $form->getData();
 
-                if ($formData !== null && $formData->getType() !== $data['type']) {
+                if (null !== $formData && $formData->getType() !== $data['type']) {
                     $formData->setConfiguration([]);
                 }
 
@@ -77,7 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
     private function addConfigurationTypeToForm(FormEvent $event): void
     {
         $data = $event->getData();
-        if ($data === null) {
+        if (null === $data) {
             return;
         }
 
diff --git a/src/Form/Type/BlockType.php b/src/Form/Type/BlockType.php
index b723c9a7..588df066 100755
--- a/src/Form/Type/BlockType.php
+++ b/src/Form/Type/BlockType.php
@@ -14,9 +14,9 @@
 use Sylius\Bundle\ChannelBundle\Form\Type\ChannelChoiceType;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 
 final class BlockType extends AbstractResourceType
 {
diff --git a/src/Importer/BlockImporter.php b/src/Importer/BlockImporter.php
index f2023280..5261460f 100644
--- a/src/Importer/BlockImporter.php
+++ b/src/Importer/BlockImporter.php
@@ -14,7 +14,6 @@
 use BitBag\SyliusCmsPlugin\Repository\BlockRepositoryInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ImporterChannelsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ImporterCollectionsResolverInterface;
-use BitBag\SyliusCmsPlugin\Resolver\ImporterProductsResolverInterface;
 use BitBag\SyliusCmsPlugin\Resolver\ResourceResolverInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Webmozart\Assert\Assert;
diff --git a/src/Repository/BlockRepositoryInterface.php b/src/Repository/BlockRepositoryInterface.php
index 2ff20d72..6ea8534d 100755
--- a/src/Repository/BlockRepositoryInterface.php
+++ b/src/Repository/BlockRepositoryInterface.php
@@ -11,7 +11,6 @@
 namespace BitBag\SyliusCmsPlugin\Repository;
 
 use BitBag\SyliusCmsPlugin\Entity\BlockInterface;
-use Doctrine\ORM\QueryBuilder;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
 interface BlockRepositoryInterface extends RepositoryInterface