diff --git a/CRM/Civicase/Helper/CaseCategory.php b/CRM/Civicase/Helper/CaseCategory.php
index 873743c86..bd69109ce 100644
--- a/CRM/Civicase/Helper/CaseCategory.php
+++ b/CRM/Civicase/Helper/CaseCategory.php
@@ -1,9 +1,9 @@
 <?php
 
 use CRM_Case_BAO_CaseType as CaseType;
+use CRM_Civicase_BAO_CaseCategoryInstance as CaseCategoryInstance;
 use CRM_Civicase_Service_CaseCategoryPermission as CaseCategoryPermission;
 use CRM_Civicase_Service_CaseManagementUtils as CaseManagementUtils;
-use CRM_Civicase_BAO_CaseCategoryInstance as CaseCategoryInstance;
 
 /**
  * CaseCategory Helper class with useful functions for managing case categories.
diff --git a/CRM/Civicase/Hook/BuildForm/ModifyCaseTypesForAdvancedSearch.php b/CRM/Civicase/Hook/BuildForm/ModifyCaseTypesForAdvancedSearch.php
index 975c7540a..05e62a5c5 100644
--- a/CRM/Civicase/Hook/BuildForm/ModifyCaseTypesForAdvancedSearch.php
+++ b/CRM/Civicase/Hook/BuildForm/ModifyCaseTypesForAdvancedSearch.php
@@ -1,10 +1,10 @@
 <?php
 
-use CRM_Civicase_Helper_CaseCategory as CaseCategoryHelper;
 use CRM_Case_BAO_CaseType as CaseType;
+use CRM_Civicase_Helper_CaseCategory as CaseCategoryHelper;
 
 /**
- * Class CRM_Civicase_Hook_BuildForm_ModifyCaseTypesForAdvancedSearch.
+ * Class Modifies CaseTypesFor AdvancedSearch.
  */
 class CRM_Civicase_Hook_BuildForm_ModifyCaseTypesForAdvancedSearch {
 
diff --git a/CRM/Civicase/Hook/NavigationMenu/AlterForCaseMenu.php b/CRM/Civicase/Hook/NavigationMenu/AlterForCaseMenu.php
index 94d285ba9..00f914acc 100644
--- a/CRM/Civicase/Hook/NavigationMenu/AlterForCaseMenu.php
+++ b/CRM/Civicase/Hook/NavigationMenu/AlterForCaseMenu.php
@@ -1,8 +1,8 @@
 <?php
 
 use Civi\Api4\OptionGroup;
-use CRM_Civicase_Service_CaseCategorySetting as CaseCategorySetting;
 use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
+use CRM_Civicase_Service_CaseCategorySetting as CaseCategorySetting;
 
 /**
  * Class CRM_Civicase_Hook_Navigation_AlterForCaseMenu.
diff --git a/CRM/Civicase/Hook/PageRun/AddContactPageSummaryResources.php b/CRM/Civicase/Hook/PageRun/AddContactPageSummaryResources.php
index b28f62a67..989d3006a 100644
--- a/CRM/Civicase/Hook/PageRun/AddContactPageSummaryResources.php
+++ b/CRM/Civicase/Hook/PageRun/AddContactPageSummaryResources.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Class CRM_Civicase_Hook_PageRun_AddContactPageSummaryResources.
+ * Class Add Resources to Contact Summary Page.
  */
 class CRM_Civicase_Hook_PageRun_AddContactPageSummaryResources {
 
diff --git a/CRM/Civicase/Hook/Tokens/SalesOrderTokens.php b/CRM/Civicase/Hook/Tokens/SalesOrderTokens.php
index 5b3179bce..b6e4dc930 100644
--- a/CRM/Civicase/Hook/Tokens/SalesOrderTokens.php
+++ b/CRM/Civicase/Hook/Tokens/SalesOrderTokens.php
@@ -1,11 +1,11 @@
 <?php
 
-use Civi\Token\Event\TokenValueEvent;
-use Civi\Token\Event\TokenRegisterEvent;
-use CRM_Civicase_ExtensionUtil as E;
 use Civi\Api4\CaseSalesOrder;
 use Civi\Token\AbstractTokenSubscriber;
+use Civi\Token\Event\TokenRegisterEvent;
+use Civi\Token\Event\TokenValueEvent;
 use Civi\Token\TokenRow;
+use CRM_Civicase_ExtensionUtil as E;
 
 /**
  * Sales Order Specific Tokens.
diff --git a/CRM/Civicase/Service/CaseTypeCategoryFeatures.php b/CRM/Civicase/Service/CaseTypeCategoryFeatures.php
index 23365c327..94e557caf 100644
--- a/CRM/Civicase/Service/CaseTypeCategoryFeatures.php
+++ b/CRM/Civicase/Service/CaseTypeCategoryFeatures.php
@@ -1,8 +1,8 @@
 <?php
 
-use Civi\Api4\OptionGroup;
 use Civi\Api4\CaseCategoryFeatures;
-use Civi\Api4\OptionValue as OptionValue;
+use Civi\Api4\OptionGroup;
+use Civi\Api4\OptionValue;
 
 /**
  * CaseTypeCategoryFeatures class.
diff --git a/Civi/Api4/Action/CaseSalesOrder/ComputeTotalAction.php b/Civi/Api4/Action/CaseSalesOrder/ComputeTotalAction.php
index ca2c7093a..ada293a57 100644
--- a/Civi/Api4/Action/CaseSalesOrder/ComputeTotalAction.php
+++ b/Civi/Api4/Action/CaseSalesOrder/ComputeTotalAction.php
@@ -2,8 +2,8 @@
 
 namespace Civi\Api4\Action\CaseSalesOrder;
 
-use Civi\Api4\Generic\Result;
 use Civi\Api4\Generic\AbstractAction;
+use Civi\Api4\Generic\Result;
 use Civi\Api4\Generic\Traits\DAOActionTrait;
 use CRM_Civicase_BAO_CaseSalesOrder as CaseSalesOrderBAO;
 
diff --git a/tests/phpunit/BaseHeadlessTest.php b/tests/phpunit/BaseHeadlessTest.php
index ea2509aa2..d3ad2d3bd 100644
--- a/tests/phpunit/BaseHeadlessTest.php
+++ b/tests/phpunit/BaseHeadlessTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
 use Civi\Test;
 use Civi\Test\HeadlessInterface;
 use Civi\Test\TransactionalInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Base test class.
diff --git a/tests/phpunit/CRM/Civicase/BAO/CaseContactLockTest.php b/tests/phpunit/CRM/Civicase/BAO/CaseContactLockTest.php
index fba943be4..7807aee85 100644
--- a/tests/phpunit/CRM/Civicase/BAO/CaseContactLockTest.php
+++ b/tests/phpunit/CRM/Civicase/BAO/CaseContactLockTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
+use Civi\Test;
 use Civi\Test\HeadlessInterface;
 use Civi\Test\TransactionalInterface;
-use Civi\Test;
 use CRM_Civicase_Test_Fabricator_Case as CaseFabricator;
 use CRM_Civicase_Test_Fabricator_CaseType as CaseTypeFabricator;
 use CRM_Civicase_Test_Fabricator_Contact as ContactFabricator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Runs tests on CaseContactLock BAO.