diff --git a/src/Command/GenerateGroupCommand.php b/src/Command/GenerateGroupCommand.php
index c5b8d4a..067bff7 100644
--- a/src/Command/GenerateGroupCommand.php
+++ b/src/Command/GenerateGroupCommand.php
@@ -6,18 +6,11 @@
 
 namespace Drupal\metatag\Command;
 
+use Drupal\metatag\Generator\MetatagGroupGenerator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Command\Shared\CommandTrait;
-use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
-use Drupal\Console\Style\DrupalStyle;
-use Drupal\metatag\Generator\MetatagGroupGenerator;
-use Drupal\Console\Extension\Manager;
-use Drupal\Console\Utils\ChainQueue;
 
 /**
  * Class GenerateGroupCommand.
@@ -28,10 +21,13 @@
  */
 class GenerateGroupCommand extends Command {
 
-  use CommandTrait;
-  use ModuleTrait;
-  use FormTrait;
-  use ConfirmationTrait;
+  use Drupal\Console\Command\Shared\CommandTrait;
+  use Drupal\Console\Command\Shared\ConfirmationTrait;
+  use Drupal\Console\Command\Shared\FormTrait;
+  use Drupal\Console\Command\Shared\ModuleTrait;
+  use Drupal\Console\Extension\Manager;
+  use Drupal\Console\Style\DrupalStyle;
+  use Drupal\Console\Utils\ChainQueue;
 
   /**
    * @var MetatagGroupGenerator
diff --git a/src/Command/GenerateTagCommand.php b/src/Command/GenerateTagCommand.php
index 4eef1e1..9c74709 100644
--- a/src/Command/GenerateTagCommand.php
+++ b/src/Command/GenerateTagCommand.php
@@ -6,20 +6,12 @@
 
 namespace Drupal\metatag\Command;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Drupal\Console\Command\Shared\CommandTrait;
-use Drupal\Console\Style\DrupalStyle;
-use Drupal\metatag\MetatagManager;
 use Drupal\metatag\Generator\MetatagTagGenerator;
-use Drupal\Console\Command\Shared\ModuleTrait;
-use Drupal\Console\Command\Shared\FormTrait;
-use Drupal\Console\Command\Shared\ConfirmationTrait;
+use Drupal\metatag\MetatagManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Drupal\Console\Extension\Manager;
-use Drupal\Console\Utils\StringConverter;
-use Drupal\Console\Utils\ChainQueue;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class GenerateTagCommand.
@@ -30,10 +22,14 @@
  */
 class GenerateTagCommand extends Command {
 
-  use CommandTrait;
-  use ModuleTrait;
-  use FormTrait;
-  use ConfirmationTrait;
+  use Drupal\Console\Command\Shared\CommandTrait;
+  use Drupal\Console\Command\Shared\ConfirmationTrait;
+  use Drupal\Console\Command\Shared\FormTrait;
+  use Drupal\Console\Command\Shared\ModuleTrait;
+  use Drupal\Console\Extension\Manager;
+  use Drupal\Console\Style\DrupalStyle;
+  use Drupal\Console\Utils\ChainQueue;
+  use Drupal\Console\Utils\StringConverter;
 
   /**
    * @var MetatagManager