diff --git a/.cspell-project-words.txt b/.cspell-project-words.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c13355bdd509bea349dcc7130af11ebd1cb5d77f
--- /dev/null
+++ b/.cspell-project-words.txt
@@ -0,0 +1,3 @@
+Skripchuk
+tarzanych
+VDER
diff --git a/config/schema/views_dynamic_entity_row.schema.yml b/config/schema/views_dynamic_entity_row.schema.yml
index a1ed1976ff3008795f09d71bcb0d6bfa705baca9..7c169a0aa2798f9a7ed7f50f49d22fee69c53d8e 100644
--- a/config/schema/views_dynamic_entity_row.schema.yml
+++ b/config/schema/views_dynamic_entity_row.schema.yml
@@ -1,6 +1,6 @@
 views_dynamic_entity_row.settings:
   type: config_object
-  label: 'Views Dynamic Enitity Row settings'
+  label: 'Views Dynamic Entity Row settings'
   mapping:
     entity_types:
       type: sequence
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index b7894ee74d079260ac310adbecca1c8ad2b010cb..adea881061097a47d6e54a6db94fa67ebffbadbf 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\views_dynamic_entity_row\Form;
 
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
@@ -22,46 +21,26 @@ class SettingsForm extends ConfigFormBase {
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityTypeManager;
+  protected EntityTypeManagerInterface $entityTypeManager;
 
   /**
    * Discovery and retrieval of entity type bundles manager.
    *
    * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
    */
-  protected $bundleInfo;
+  protected EntityTypeBundleInfoInterface $bundleInfo;
 
   /**
    * The Views dynamic entity row plugin settings manager.
    *
    * @var \Drupal\views_dynamic_entity_row\DynamicEntityRowManagerInterface
    */
-  protected $dynamicRowManager;
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory for configutration manager.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
-   *   Discovery and retrieval of entity type bundles manager.
-   * @param \Drupal\views_dynamic_entity_row\DynamicEntityRowManagerInterface $dynamic_row_manager
-   *   The Views dynamic entity row plugin settings manager.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, DynamicEntityRowManagerInterface $dynamic_row_manager) {
-    parent::__construct($config_factory);
-
-    $this->entityTypeManager = $entity_type_manager;
-    $this->bundleInfo = $bundle_info;
-    $this->dynamicRowManager = $dynamic_row_manager;
-  }
+  protected DynamicEntityRowManagerInterface $dynamicRowManager;
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container): static {
     return new static(
       $container->get('config.factory'),
       $container->get('entity_type.manager'),
diff --git a/views_dynamic_entity_row.module b/views_dynamic_entity_row.module
index cf82c51c67875c0f5331487edcd5a5c01eba8a44..3dec1ca71ec3456448145d5a0e7f41d0f4bd6e15 100644
--- a/views_dynamic_entity_row.module
+++ b/views_dynamic_entity_row.module
@@ -5,11 +5,11 @@
  * Contains views_dynamic_entity_row.module.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
+use Drupal\Core\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().