diff --git a/modules/apigee_asyncapi_doc/src/EventSubscriber/ApigeeAsyncapiDocSubscriber.php b/modules/apigee_asyncapi_doc/src/EventSubscriber/ApigeeAsyncapiDocSubscriber.php
index e52aefd..76bd365 100644
--- a/modules/apigee_asyncapi_doc/src/EventSubscriber/ApigeeAsyncapiDocSubscriber.php
+++ b/modules/apigee_asyncapi_doc/src/EventSubscriber/ApigeeAsyncapiDocSubscriber.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_asyncapi_doc\EventSubscriber;
 
-use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\views\Views;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/modules/apigee_freeform_doc/src/EventSubscriber/ApigeeFreeformDocSubscriber.php b/modules/apigee_freeform_doc/src/EventSubscriber/ApigeeFreeformDocSubscriber.php
index 53cfa25..ee6e92e 100644
--- a/modules/apigee_freeform_doc/src/EventSubscriber/ApigeeFreeformDocSubscriber.php
+++ b/modules/apigee_freeform_doc/src/EventSubscriber/ApigeeFreeformDocSubscriber.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_freeform_doc\EventSubscriber;
 
-use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\views\Views;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/modules/apigee_graphql_doc/src/Controller/ApigeeGraphqlServerController.php b/modules/apigee_graphql_doc/src/Controller/ApigeeGraphqlServerController.php
index 2ec4b10..9fef5fd 100644
--- a/modules/apigee_graphql_doc/src/Controller/ApigeeGraphqlServerController.php
+++ b/modules/apigee_graphql_doc/src/Controller/ApigeeGraphqlServerController.php
@@ -24,8 +24,8 @@
 
 namespace Drupal\apigee_graphql_doc\Controller;
 
-use Drupal\Core\Controller\ControllerBase;
 use Drupal\Component\Serialization\Json;
+use Drupal\Core\Controller\ControllerBase;
 use Drupal\file\Entity\File;
 use Drupal\node\NodeInterface;
 use GraphQL\GraphQL;
diff --git a/modules/apigee_graphql_doc/src/EventSubscriber/ApigeeGraphqlDocSubscriber.php b/modules/apigee_graphql_doc/src/EventSubscriber/ApigeeGraphqlDocSubscriber.php
index 8929c46..95a840c 100644
--- a/modules/apigee_graphql_doc/src/EventSubscriber/ApigeeGraphqlDocSubscriber.php
+++ b/modules/apigee_graphql_doc/src/EventSubscriber/ApigeeGraphqlDocSubscriber.php
@@ -20,9 +20,9 @@
 
 namespace Drupal\apigee_graphql_doc\EventSubscriber;
 
-use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\views\Views;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/src/Entity/Access/ApiDocAccessControlHandler.php b/src/Entity/Access/ApiDocAccessControlHandler.php
index f88c4e2..6dfb6e5 100755
--- a/src/Entity/Access/ApiDocAccessControlHandler.php
+++ b/src/Entity/Access/ApiDocAccessControlHandler.php
@@ -21,13 +21,13 @@
 namespace Drupal\apigee_api_catalog\Entity\Access;
 
 use Drupal\apigee_api_catalog\Entity\ApiDocInterface;
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/src/Entity/ApiDoc.php b/src/Entity/ApiDoc.php
index dec883b..02f716d 100755
--- a/src/Entity/ApiDoc.php
+++ b/src/Entity/ApiDoc.php
@@ -22,11 +22,11 @@
 
 use Drupal\apigee_api_catalog\Entity\Form\ApiDocSettingsForm;
 use Drupal\Core\Entity\EditorialContentEntityBase;
+use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\RevisionableInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Entity\EntityChangedTrait;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\link\LinkItemInterface;
 
 /**
diff --git a/src/Plugin/Field/FieldFormatter/SmartDocsFormatter.php b/src/Plugin/Field/FieldFormatter/SmartDocsFormatter.php
index 7e2dac3..62b6524 100644
--- a/src/Plugin/Field/FieldFormatter/SmartDocsFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/SmartDocsFormatter.php
@@ -20,6 +20,7 @@
 namespace Drupal\apigee_api_catalog\Plugin\Field\FieldFormatter;
 
 use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
+use Drupal\Component\Serialization\Json;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
@@ -27,7 +28,6 @@
 use Drupal\Core\Serialization\Yaml;
 use Drupal\file\Plugin\Field\FieldFormatter\FileFormatterBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Serialization\Json;
 
 /**
  * Plugin implementation of the SmartDocs OpenAPI spec formatter.
diff --git a/src/SpecFetcher.php b/src/SpecFetcher.php
index a50e4c9..5229d01 100644
--- a/src/SpecFetcher.php
+++ b/src/SpecFetcher.php
@@ -29,8 +29,8 @@
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Request;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
diff --git a/src/UpdateService.php b/src/UpdateService.php
index 7da5a48..54d0f96 100644
--- a/src/UpdateService.php
+++ b/src/UpdateService.php
@@ -24,10 +24,10 @@
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Utility\UpdateException;
 use Drupal\field\Entity\FieldConfig;