diff --git a/src/ApplicationCore/Entities/BasketAggregate/BasketItem.cs b/src/ApplicationCore/Entities/BasketAggregate/BasketItem.cs
index 18f6203..10fb1c9 100644
--- a/src/ApplicationCore/Entities/BasketAggregate/BasketItem.cs
+++ b/src/ApplicationCore/Entities/BasketAggregate/BasketItem.cs
@@ -1,5 +1,4 @@
 using Ardalis.GuardClauses;
-using System;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate
 {
diff --git a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs
index 5705eb1..915ac1b 100644
--- a/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs
+++ b/src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs
@@ -1,5 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using Ardalis.GuardClauses;
+using Ardalis.GuardClauses;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System.Collections.Generic;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate
diff --git a/src/ApplicationCore/Entities/OrderAggregate/Address.cs b/src/ApplicationCore/Entities/OrderAggregate/Address.cs
index 3e99159..eaab8f7 100644
--- a/src/ApplicationCore/Entities/OrderAggregate/Address.cs
+++ b/src/ApplicationCore/Entities/OrderAggregate/Address.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
 {
     public class Address // ValueObject
     {
diff --git a/src/ApplicationCore/Entities/OrderAggregate/Order.cs b/src/ApplicationCore/Entities/OrderAggregate/Order.cs
index c869041..fab8b0e 100644
--- a/src/ApplicationCore/Entities/OrderAggregate/Order.cs
+++ b/src/ApplicationCore/Entities/OrderAggregate/Order.cs
@@ -1,5 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using Ardalis.GuardClauses;
+using Ardalis.GuardClauses;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/ApplicationCore/Exceptions/GuardExtensions.cs b/src/ApplicationCore/Exceptions/GuardExtensions.cs
index 55f27b3..67796ac 100644
--- a/src/ApplicationCore/Exceptions/GuardExtensions.cs
+++ b/src/ApplicationCore/Exceptions/GuardExtensions.cs
@@ -1,5 +1,5 @@
-using Microsoft.eShopWeb.ApplicationCore.Exceptions;
-using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Exceptions;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/ApplicationCore/Services/BasketService.cs b/src/ApplicationCore/Services/BasketService.cs
index 84bc01e..bce7935 100644
--- a/src/ApplicationCore/Services/BasketService.cs
+++ b/src/ApplicationCore/Services/BasketService.cs
@@ -1,9 +1,9 @@
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using Microsoft.eShopWeb.ApplicationCore.Specifications;
-using Ardalis.GuardClauses;
+using Ardalis.GuardClauses;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Specifications;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopWeb.ApplicationCore.Services
 {
diff --git a/src/BlazorAdmin/CustomAuthStateProvider.cs b/src/BlazorAdmin/CustomAuthStateProvider.cs
index 6057f82..f1565c4 100644
--- a/src/BlazorAdmin/CustomAuthStateProvider.cs
+++ b/src/BlazorAdmin/CustomAuthStateProvider.cs
@@ -1,5 +1,4 @@
-using BlazorAdmin.Services;
-using BlazorShared.Authorization;
+using BlazorShared.Authorization;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
 using System;
diff --git a/src/BlazorAdmin/JavaScript/Cookies.cs b/src/BlazorAdmin/JavaScript/Cookies.cs
index f32ba34..f6b068e 100644
--- a/src/BlazorAdmin/JavaScript/Cookies.cs
+++ b/src/BlazorAdmin/JavaScript/Cookies.cs
@@ -1,5 +1,5 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
 
 namespace BlazorAdmin.JavaScript
 {
diff --git a/src/BlazorAdmin/JavaScript/Css.cs b/src/BlazorAdmin/JavaScript/Css.cs
index cf59391..9c725ef 100644
--- a/src/BlazorAdmin/JavaScript/Css.cs
+++ b/src/BlazorAdmin/JavaScript/Css.cs
@@ -1,5 +1,5 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
 
 namespace BlazorAdmin.JavaScript
 {
diff --git a/src/BlazorAdmin/JavaScript/Route.cs b/src/BlazorAdmin/JavaScript/Route.cs
index 1a85d6a..e8d5623 100644
--- a/src/BlazorAdmin/JavaScript/Route.cs
+++ b/src/BlazorAdmin/JavaScript/Route.cs
@@ -1,5 +1,5 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
 
 namespace BlazorAdmin.JavaScript
 {