diff --git a/src/Plugin/Condition/SystemTags.php b/src/Plugin/Condition/SystemTags.php
index f356160c704f3f18d80f38eaf37ad3eba9a46c78..4eab5f98d831056eb61f740334cb018a29ad4911 100644
--- a/src/Plugin/Condition/SystemTags.php
+++ b/src/Plugin/Condition/SystemTags.php
@@ -45,7 +45,7 @@ class SystemTags extends ConditionPluginBase implements ContainerFactoryPluginIn
     array $configuration,
     $plugin_id,
     $plugin_definition,
-    RouteMatchInterface $route_match,
+    RouteMatchInterface $route_match
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
diff --git a/src/SystemTagFinder/SystemTagFinderPluginBase.php b/src/SystemTagFinder/SystemTagFinderPluginBase.php
index b6765c086d9a1d5db03cac2c7f5e3329a1c785ad..c43463d70c523b187510015816a2742496a71685 100644
--- a/src/SystemTagFinder/SystemTagFinderPluginBase.php
+++ b/src/SystemTagFinder/SystemTagFinderPluginBase.php
@@ -60,7 +60,7 @@ abstract class SystemTagFinderPluginBase extends PluginBase implements SystemTag
     $plugin_definition,
     SystemTagHelperInterface $system_tag_helper,
     EntityTypeManagerInterface $entity_type_manager,
-    LanguageManagerInterface $language_manager,
+    LanguageManagerInterface $language_manager
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
diff --git a/system_tags.tokens.inc b/system_tags.tokens.inc
index 2bba21dac79f16152b727246763e0dba23e5109f..ccad00d008198b2c0d1bfdaf7c6136497ad02ed5 100644
--- a/system_tags.tokens.inc
+++ b/system_tags.tokens.inc
@@ -58,7 +58,7 @@ function system_tags_tokens($type, array $tokens, array $data, array $options, B
     /** @var \Drupal\path_alias\AliasManagerInterface $path_alias_manager */
     $path_alias_manager = Drupal::service('path_alias.manager');
     foreach ($tokens as $token_id => $original) {
-      list($entity_type, $tag_id) = explode('--', $token_id);
+      [$entity_type, $tag_id] = explode('--', $token_id);
 
       /** @var \Drupal\system_tags\SystemTagFinder\SystemTagFinderInterface $system_tag_finder */
       $system_tag_finder = Drupal::service('plugin.manager.system_tags.system_tag_finder_manager')