diff --git a/src/Plugin/Block/Barcode.php b/src/Plugin/Block/Barcode.php
index 71607e1f5c8ebbf29b04af7cddf38ecc270bf943..588e6fa964cc52557f6f4a5226ccc62eaba61795 100644
--- a/src/Plugin/Block/Barcode.php
+++ b/src/Plugin/Block/Barcode.php
@@ -69,20 +69,8 @@ final class Barcode extends BlockBase implements ContainerFactoryPluginInterface
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The currently active route match object.
    */
-  public function __construct(
-      array $configuration,
-      $plugin_id,
-      $plugin_definition,
-      LoggerInterface $logger,
-      ModuleHandlerInterface $module_handler,
-      Token $token,
-      RouteMatchInterface $route_match
-  ) {
-    parent::__construct(
-      $configuration,
-      $plugin_id,
-      $plugin_definition
-    );
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerInterface $logger, ModuleHandlerInterface $module_handler, Token $token, RouteMatchInterface $route_match) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->logger = $logger;
     $this->moduleHandler = $module_handler;
     $this->token = $token;
@@ -92,13 +80,8 @@ final class Barcode extends BlockBase implements ContainerFactoryPluginInterface
   /**
    * {@inheritdoc}
    */
-  public static function create(
-      ContainerInterface $container,
-      array $configuration,
-      $plugin_id,
-      $plugin_definition
-  ) {
-    return new self(
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
       $configuration,
       $plugin_id,
       $plugin_definition,
diff --git a/src/Plugin/Field/FieldFormatter/Barcode.php b/src/Plugin/Field/FieldFormatter/Barcode.php
index 56a7d513bf248ca6d54148dfd6c73929a4468045..c179ec3f958ab07cea1e6dcdd2b71e07c9eb92a6 100644
--- a/src/Plugin/Field/FieldFormatter/Barcode.php
+++ b/src/Plugin/Field/FieldFormatter/Barcode.php
@@ -52,26 +52,8 @@ final class Barcode extends FormatterBase implements ContainerFactoryPluginInter
   /**
    * CompanyController constructor.
    */
-  public function __construct(
-      $plugin_id,
-      $plugin_definition,
-      FieldDefinitionInterface $field_definition,
-      array $settings,
-      $label,
-      $view_mode,
-      array $third_party_settings,
-      Token $token,
-      LoggerChannelFactoryInterface $logger_factory
-    ) {
-    parent::__construct(
-      $plugin_id,
-      $plugin_definition,
-      $field_definition,
-      $settings,
-      $label,
-      $view_mode,
-      $third_party_settings
-    );
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, Token $token, LoggerChannelFactoryInterface $logger_factory) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->token = $token;
     $this->logger = $logger_factory->get('barcodes');
   }