diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
index 44749ff6c..3ecddcf36 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/OrderData.cs
@@ -42,7 +42,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 
         public string Buyer { get; set; }
 
-        public List<OrderItemData> OrderItems { get;  } = new List<OrderItemData>();
+        public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
     }
 
 }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
index c5a6ccb3e..066f01a9c 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs
@@ -5,7 +5,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 
     public class UpdateBasketItemsRequest
     {
-        
+
         public string BasketId { get; set; }
 
         public ICollection<UpdateBasketItemData> Updates { get; set; }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
index a1c255551..f8fb7eb03 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Models
 {
-    
+
     public class UpdateBasketRequest
     {
         public string BuyerId { get; set; }
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
index 8bd4c8948..b4cf4c417 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/BasketService.cs
@@ -27,7 +27,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
         {
             return await GrpcCallerService.CallService(_urls.GrpcBasket, async channel =>
             {
-                
+
                 var client = new Basket.BasketClient(channel);
                 _logger.LogDebug("grpc client created, request = {@id}", id);
                 var response = await client.GetBasketByIdAsync(new BasketRequest { Id = id });
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
index f98b90989..2257b408a 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/CatalogService.cs
@@ -36,7 +36,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
         public async Task<IEnumerable<CatalogItem>> GetCatalogItemsAsync(IEnumerable<int> ids)
         {
 
-            return await GrpcCallerService.CallService(_urls.GrpcCatalog, async channel=>
+            return await GrpcCallerService.CallService(_urls.GrpcCatalog, async channel =>
             {
                 var client = new CatalogClient(channel);
                 var request = new CatalogItemsRequest { Ids = string.Join(",", ids), PageIndex = 1, PageSize = 10 };
diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
index 55f3df3ee..0160a7873 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
@@ -15,15 +15,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
 
             var channel = GrpcChannel.ForAddress(urlGrpc);
 
-            /*
-            using var httpClientHandler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; }
-            };
-
-            */
-
-
             Log.Information("Creating grpc client base address urlGrpc ={@urlGrpc}, BaseAddress={@BaseAddress} ", urlGrpc, channel.Target);
 
             try
@@ -47,13 +38,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator.Services
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2Support", true);
 
-            /*
-            using var httpClientHandler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; }
-            };
-            */
-
             var channel = GrpcChannel.ForAddress(urlGrpc);
 
             Log.Debug("Creating grpc client base address {@httpClient.BaseAddress} ", channel.Target);
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
index b16530e1b..b19874aac 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs
@@ -20,7 +20,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
         public class BasketOperations
         {
             public static string GetItemById(string id) => $"/api/v1/basket/{id}";
-            
+
             public static string UpdateBasket() => "/api/v1/basket";
         }
 
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
index 2039c7c4f..83ecd95f2 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Services/GrpcCallerService.cs
@@ -15,15 +15,6 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
 
             var channel = GrpcChannel.ForAddress(urlGrpc);
 
-            /*
-            using var httpClientHandler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; }
-            };
-
-            */
-
-
             Log.Information("Creating grpc client base address urlGrpc ={@urlGrpc}, BaseAddress={@BaseAddress} ", urlGrpc, channel.Target);
 
             try
@@ -49,13 +40,6 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
             AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2Support", true);
 
-            /*
-            using var httpClientHandler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; }
-            };
-            */
-
             var channel = GrpcChannel.ForAddress(urlGrpc);
 
             Log.Debug("Creating grpc client base address {@httpClient.BaseAddress} ", channel.Target);
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
index 1ea6c0f4f..243e3a01e 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
@@ -63,7 +63,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
             {
                 app.UseDeveloperExceptionPage();
             }
-            
+
             app.UseHttpsRedirection();
 
             app.UseSwagger().UseSwaggerUI(c =>