diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
index 65381579..30ba59e4 100644
--- a/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
+++ b/apps/auth-server/src/EShopOnAbp.AuthServer/EShopOnAbpAuthServerModule.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using EShopOnAbp.AdministrationService.EntityFrameworkCore;
+using EShopOnAbp.AdministrationService.EntityFrameworkCore;
 using EShopOnAbp.IdentityService.EntityFrameworkCore;
 using EShopOnAbp.SaasService.EntityFrameworkCore;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
@@ -12,6 +9,9 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using StackExchange.Redis;
+using System;
+using System.IO;
+using System.Linq;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
@@ -39,9 +39,9 @@ namespace EShopOnAbp.AuthServer
         typeof(AbpAccountApplicationModule),
         typeof(EShopOnAbpSharedHostingAspNetCoreModule),
         typeof(EShopOnAbpSharedLocalizationModule),
-         typeof(AdministrationServiceEntityFrameworkCoreModule),
-         typeof(IdentityServiceEntityFrameworkCoreModule),
-         typeof(SaasServiceEntityFrameworkCoreModule)
+        typeof(AdministrationServiceEntityFrameworkCoreModule),
+        typeof(IdentityServiceEntityFrameworkCoreModule),
+        typeof(SaasServiceEntityFrameworkCoreModule)
     )]
     public class EShopOnAbpAuthServerModule : AbpModule
     {
diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs
index 31a4291a..b236243d 100644
--- a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs
+++ b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs
@@ -43,4 +43,4 @@ namespace EShopOnAbp.AuthServer
                 .UseAutofac()
                 .UseSerilog();
     }
-}
\ No newline at end of file
+}
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
index c559e959..71917b2b 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using EShopOnAbp.Shared.Hosting.Gateways;
+using EShopOnAbp.Shared.Hosting.Gateways;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Ocelot.Middleware;
+using System.Collections.Generic;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Modularity;
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
index afc753a5..cd7274fa 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Threading.Tasks;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
+using System;
+using System.Threading.Tasks;
 
 namespace EShopOnAbp.WebPublicGateway
 {
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs
index 17c2b98a..4dab1503 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace EShopOnAbp.WebPublicGateway
@@ -11,7 +10,7 @@ namespace EShopOnAbp.WebPublicGateway
             services.AddApplication<EShopOnAbpWebPublicGatewayModule>();
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app)
         {
             app.InitializeApplication();
         }
diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
index b8a0b11b..a6b3277c 100644
--- a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
+++ b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Threading.Tasks;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
+using System;
+using System.Threading.Tasks;
 
 namespace EShopOnAbp.WebGateway
 {
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
index cf4151d5..afc8ab09 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/AdministrationServiceHttpApiHostModule.cs
@@ -3,30 +3,16 @@ using EShopOnAbp.AdministrationService.EntityFrameworkCore;
 using EShopOnAbp.SaasService;
 using EShopOnAbp.Shared.Hosting.Microservices;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
-using Serilog;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Http.Client.IdentityModel.Web;
 using Volo.Abp.Identity;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Volo.Abp.MultiTenancy;
 using Volo.Abp.Threading;
-using Volo.Abp.UI.Navigation.Urls;
-using Volo.Abp.VirtualFileSystem;
 
 namespace EShopOnAbp.AdministrationService
 {
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs
index 5431630d..148befce 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/DbMigrations/AdministrationServiceDatabaseMigrationEventHandler.cs
@@ -1,9 +1,7 @@
 using EShopOnAbp.AdministrationService.EntityFrameworkCore;
 using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Data;
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs
index daaa15fb..69f9c74d 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using EShopOnAbp.Shared.Hosting.AspNetCore;
+using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Events;
+using System;
+using System.Threading.Tasks;
 
 namespace EShopOnAbp.AdministrationService
 {
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs
index 93cc8595..c416abff 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace EShopOnAbp.AdministrationService
 {
@@ -12,7 +10,7 @@ namespace EShopOnAbp.AdministrationService
             services.AddApplication<AdministrationServiceHttpApiHostModule>();
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
             app.InitializeApplication();
         }
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
index 160daf32..da93e1c8 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
@@ -1,9 +1,9 @@
-using System;
+using IdentityServer4.Models;
+using Microsoft.Extensions.Configuration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using IdentityServer4.Models;
-using Microsoft.Extensions.Configuration;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs
index ec1805c5..8305c223 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationChecker.cs
@@ -1,6 +1,6 @@
-using System;
-using EShopOnAbp.IdentityService.EntityFrameworkCore;
+using EShopOnAbp.IdentityService.EntityFrameworkCore;
 using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations;
+using System;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs
index b6901c68..ad418510 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServiceDatabaseMigrationEventHandler.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EShopOnAbp.IdentityService.EntityFrameworkCore;
+using EShopOnAbp.IdentityService.EntityFrameworkCore;
 using EShopOnAbp.Shared.Hosting.Microservices.DbMigrations;
 using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Identity;
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs
index 7e4d02bb..906ecea8 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs
@@ -1,13 +1,13 @@
 using EShopOnAbp.IdentityService.DbMigrations;
+using EShopOnAbp.IdentityService.EntityFrameworkCore;
+using EShopOnAbp.Shared.Hosting.Microservices;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using EShopOnAbp.IdentityService.EntityFrameworkCore;
-using EShopOnAbp.Shared.Hosting.Microservices;
 using Volo.Abp;
+using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
-using Volo.Abp.Data;
 
 namespace EShopOnAbp.IdentityService
 {
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs
index 35d543f4..5f5c9a52 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using EShopOnAbp.Shared.Hosting.AspNetCore;
+using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Events;
+using System;
+using System.Threading.Tasks;
 
 namespace EShopOnAbp.IdentityService
 {
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs
index b70578d5..04b114fe 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace EShopOnAbp.IdentityService
 {
@@ -12,7 +10,7 @@ namespace EShopOnAbp.IdentityService
             services.AddApplication<IdentityServiceHttpApiHostModule>();
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
             app.InitializeApplication();
         }
diff --git a/shared/EShopOnAbp.Shared.Hosting.AspNetCore/SerilogConfigurationHelper.cs b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/SerilogConfigurationHelper.cs
index 5240ca67..0c0b922c 100644
--- a/shared/EShopOnAbp.Shared.Hosting.AspNetCore/SerilogConfigurationHelper.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/SerilogConfigurationHelper.cs
@@ -7,6 +7,7 @@ namespace EShopOnAbp.Shared.Hosting.AspNetCore
     {
         public static void Configure(string applicationName)
         {
+            // TODO: Uncomment following lines for ElasticSearch configuration
             // var configuration = new ConfigurationBuilder()
             //     .SetBasePath(Directory.GetCurrentDirectory())
             //     .AddJsonFile("appsettings.json")
@@ -24,6 +25,7 @@ namespace EShopOnAbp.Shared.Hosting.AspNetCore
                 .Enrich.FromLogContext()
                 .Enrich.WithProperty("Application", $"{applicationName}")
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
+                // TODO: Uncomment following lines for ElasticSearch configuration
                 // .WriteTo.Elasticsearch(
                 //     new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
                 //     {
diff --git a/shared/EShopOnAbp.Shared.Hosting.Gateways/SwaggerWithAuthConfigurationHelper.cs b/shared/EShopOnAbp.Shared.Hosting.Gateways/SwaggerWithAuthConfigurationHelper.cs
index 0335dfc9..fe892a65 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Gateways/SwaggerWithAuthConfigurationHelper.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Gateways/SwaggerWithAuthConfigurationHelper.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
+using System.Collections.Generic;
 using Volo.Abp.Modularity;
 
 namespace EShopOnAbp.Shared.Hosting.Gateways
diff --git a/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbpSharedHostingMicroservicesModule.cs b/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbpSharedHostingMicroservicesModule.cs
index ca280fdf..f2554fb3 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbpSharedHostingMicroservicesModule.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Microservices/EShopOnAbpSharedHostingMicroservicesModule.cs
@@ -1,5 +1,4 @@
-using System;
-using EShopOnAbp.AdministrationService.EntityFrameworkCore;
+using EShopOnAbp.AdministrationService.EntityFrameworkCore;
 using EShopOnAbp.SaasService.EntityFrameworkCore;
 using EShopOnAbp.Shared.Hosting.AspNetCore;
 using Microsoft.AspNetCore.DataProtection;
diff --git a/shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs b/shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs
index 7a652861..720f5517 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Microservices/JwtBearerConfigurationHelper.cs
@@ -1,11 +1,11 @@
-using System;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 using Volo.Abp.Modularity;
 
 namespace EShopOnAbp.Shared.Hosting.Microservices
 {
-    public class JwtBearerConfigurationHelper
+    public static class JwtBearerConfigurationHelper
     {
         public static void Configure(
             ServiceConfigurationContext context,
diff --git a/shared/EShopOnAbp.Shared.Hosting.Microservices/SwaggerConfigurationHelper.cs b/shared/EShopOnAbp.Shared.Hosting.Microservices/SwaggerConfigurationHelper.cs
index abeda992..22dd7058 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Microservices/SwaggerConfigurationHelper.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Microservices/SwaggerConfigurationHelper.cs
@@ -4,7 +4,7 @@ using Volo.Abp.Modularity;
 
 namespace EShopOnAbp.Shared.Hosting.Microservices
 {
-    public class SwaggerConfigurationHelper
+    public static class SwaggerConfigurationHelper
     {
         public static void Configure(
             ServiceConfigurationContext context,