diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 503815a25..72f26b165 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -28,55 +28,64 @@
 # PRLabel: %Azure.Identity
 /sdk/identity/           @antkmsft @rickwinter @LarryOsterman @Azure/azure-sdk-write-identity
 
-###########
-# Client SDKs
-###########
+####################
+# Client Libraries
+####################
 
-# AzureSdkOwners: @rickwinter
-# ServiceLabel: %App Configuration
 # PRLabel: %App Configuration
-/sdk/appconfiguration/   @LarryOsterman @antkmsft @RickWinter
+/sdk/appconfiguration/                                             @LarryOsterman @antkmsft @RickWinter
 
-# ServiceOwners: @gkostal @anilba06 @ahmadmsft
-# ServiceLabel: %Attestation
+# ServiceLabel: %App Configuration
+# AzureSdkOwners:                                                  @rickwinter
+# ServiceOwners:                                                   @LarryOsterman @antkmsft @RickWinter
 
 # PRLabel: %Attestation
-/sdk/attestation/        @gkostal @anilba06 @ahmadmsft @LarryOsterman @rickwinter
+/sdk/attestation/                                                  @gkostal @anilba06 @ahmadmsft @LarryOsterman @rickwinter
+
+# ServiceLabel: %Attestation
+# ServiceOwners:                                                   @gkostal @anilba06 @ahmadmsft
+
+# PRLabel: %EngSys
+/sdk/template/                                                     @danieljurek @weshaggard @LarryOsterman @RickWinter
+
+# ServiceLabel: %EngSys
+# AzureSdkOwners:                                                  @danieljurek
+# ServiceOwners:                                                   @danieljurek @weshaggard @LarryOsterman @RickWinter
 
-# AzureSdkOwners: @LarryOsterman
-# ServiceLabel: %Event Hubs
 # PRLabel: %Event Hubs
-/sdk/eventhubs/           @LarryOsterman @antkmsft @RickWinter
+/sdk/eventhubs/                                                    @LarryOsterman @antkmsft @RickWinter
 
-# AzureSdkOwners: @rickwinter @Azure/azure-sdk-write-keyvault
-# ServiceLabel:  %KeyVault
-# ServiceOwners:         @cheathamb36 @chen-karen @Azure/azure-sdk-write-keyvault
+# ServiceLabel: %Event Hubs
+# AzureSdkOwners:                                                  @LarryOsterman
+# ServiceOwners:                                                   @LarryOsterman @antkmsft @RickWinter
 
 # PRLabel: %KeyVault
-/sdk/keyvault/           @antkmsft @rickwinter @LarryOsterman @Azure/azure-sdk-write-keyvault
+/sdk/keyvault/                                                     @antkmsft @rickwinter @LarryOsterman @Azure/azure-sdk-write-keyvault
 
-# ServiceOwners:@vinjiang @Jinming-Hu @microzchang
-# ServiceLabel: %Storage
-
-# PRLabel: %Storage
-/sdk/storage/            @vinjiang @Jinming-Hu @EmmaZhu @antkmsft @LarryOsterman @microzchang
-
-# AzureSdkOwners: @rickwinter
-# ServiceLabel: %Tables
-# PRLabel: %Tables
-/sdk/tables/            @LarryOsterman @antkmsft
-
-# AzureSdkOwners: @danieljurek
-# ServiceLabel: %EngSys
-# PRLabel: %EngSys
-/sdk/template/           @danieljurek @weshaggard @LarryOsterman @RickWinter
+# ServiceLabel: %KeyVault
+# AzureSdkOwners:                                                  @rickwinter @Azure/azure-sdk-write-keyvault
+# ServiceOwners:                                                   @cheathamb36 @chen-karen @Azure/azure-sdk-write-keyvault
 
 # ServiceLabel: %Operator Nexus - Network Cloud
-#/<NotInRepo>/           @Azure/azure-sdk-write-networkcloud
+# ServiceOwners:                                                   @Azure/azure-sdk-write-networkcloud
+
+# PRLabel: %Storage
+/sdk/storage/                                                      @vinjiang @Jinming-Hu @EmmaZhu @antkmsft @LarryOsterman @microzchang
+
+# ServiceLabel: %Storage
+# ServiceOwners:                                                   @vinjiang @Jinming-Hu @microzchang
+
+# PRLabel: %Tables
+/sdk/tables/                                                       @LarryOsterman @antkmsft
+
+# ServiceLabel: %Tables
+# AzureSdkOwners:                                                  @rickwinter
+# ServiceOwners:                                                   @LarryOsterman @antkmsft
 
 ###########
 # Eng Sys
 ###########
+
 /eng/                    @danieljurek @weshaggard @benbp
 /eng/common/             @Azure/azure-sdk-eng
 /.github/workflows/      @Azure/azure-sdk-eng