diff --git a/src/ApiGateways/ApiGw-Base/Program.cs b/src/ApiGateways/ApiGw-Base/Program.cs
index effd5684e..0e8445ce8 100644
--- a/src/ApiGateways/ApiGw-Base/Program.cs
+++ b/src/ApiGateways/ApiGw-Base/Program.cs
@@ -1,31 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using static Microsoft.AspNetCore.Hosting.WebHostBuilderExtensions;
+using static Microsoft.AspNetCore.Hosting.WebHostExtensions;
+using IWebHost = Microsoft.AspNetCore.Hosting.IWebHost;
+using Path = System.IO.Path;
+using WebHost = Microsoft.AspNetCore.WebHost;
 
 namespace OcelotApiGw
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
-        }
+	public class Program
+	{
+		public static void Main(string[] args)
+		{
+			BuildWebHost(args).Run();
+		}
 
-        public static IWebHost BuildWebHost(string[] args)
-        {
-            IWebHostBuilder builder = WebHost.CreateDefaultBuilder(args);
-            builder.ConfigureServices(s => s.AddSingleton(builder))
-                .ConfigureAppConfiguration(ic => ic.AddJsonFile(Path.Combine("configuration", "configuration.json")))
-                .UseStartup<Startup>();
-            IWebHost host = builder.Build();
-            return host;
-        }
-    }
+		public static IWebHost BuildWebHost(string[] args)
+		{
+			var builder = WebHost.CreateDefaultBuilder(args);
+			builder
+				.ConfigureServices(s => s.AddSingleton(builder))
+				.ConfigureAppConfiguration(ic => ic.AddJsonFile(Path.Combine("configuration", "configuration.json")))
+				.UseStartup<Startup>();
+			var host = builder.Build();
+			return host;
+		}
+	}
 }
diff --git a/src/ApiGateways/ApiGw-Base/Startup.cs b/src/ApiGateways/ApiGw-Base/Startup.cs
index f6a36b59e..1a342eb53 100644
--- a/src/ApiGateways/ApiGw-Base/Startup.cs
+++ b/src/ApiGateways/ApiGw-Base/Startup.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CacheManager.Core;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -14,78 +8,90 @@ using Ocelot.Middleware;
 
 namespace OcelotApiGw
 {
-    public class Startup
-    {
+	public class Startup
+	{
 
-        private readonly IConfiguration _cfg;
+		private readonly IConfiguration _cfg;
 
-        public Startup(IConfiguration configuration)
-        {
-            _cfg = configuration;
-        }
+		public Startup(IConfiguration configuration)
+		{
+			_cfg = configuration;
+		}
 
-        public void ConfigureServices(IServiceCollection services)
-        {
-            var identityUrl = _cfg.GetValue<string>("IdentityUrl");
-            var authenticationProviderKey = "IdentityApiKey";
+		public void ConfigureServices(IServiceCollection services)
+		{
+			var identityUrl = _cfg.GetValue<string>("IdentityUrl");
+			var authenticationProviderKey = "IdentityApiKey";
 
-            services.AddCors(options =>
-            {
-                options.AddPolicy("CorsPolicy",
-                    builder => builder.AllowAnyOrigin()
-                    .AllowAnyMethod()
-                    .AllowAnyHeader()
-                    .AllowCredentials());
-            });
+			services
+				.AddCors(options =>
+				{
+					options
+						.AddPolicy(
+							"CorsPolicy",
+							builder => 
+								builder
+									.AllowAnyOrigin()
+									.AllowAnyMethod()
+									.AllowAnyHeader()
+									.AllowCredentials()
+						);
+				});
 
-            services.AddAuthentication()
-                .AddJwtBearer(authenticationProviderKey, x =>
-                {
-                    x.Authority = identityUrl;
-                    x.RequireHttpsMetadata = false;
-                    x.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()
-                    {
-                        ValidAudiences = new[] { "orders", "basket", "locations", "marketing", "mobileshoppingagg", "webshoppingagg" }
-                    };
-                    x.Events = new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents()
-                    {
-                        OnAuthenticationFailed = async ctx =>
-                        {
-                            int i = 0;
-                        },
-                        OnTokenValidated = async ctx =>
-                        {
-                            int i = 0;
-                        },
+			services
+				.AddAuthentication()
+				.AddJwtBearer(
+					authenticationProviderKey, 
+					x =>
+					{
+						x.Authority = identityUrl;
+						x.RequireHttpsMetadata = false;
+						x.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()
+						{
+							ValidAudiences = new[] { "orders", "basket", "locations", "marketing", "mobileshoppingagg", "webshoppingagg" }
+						};
+						x.Events = new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents()
+						{
+	#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+							OnAuthenticationFailed = async ctx =>
+	#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+							{
+							},
+	#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+							OnTokenValidated = async ctx =>
+	#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+							{
+							},
 
-                        OnMessageReceived = async ctx =>
-                        {
-                            int i = 0;
-                        }
-                    };
-                });
+	#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
+							OnMessageReceived = async ctx =>
+	#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
+							{
+							}
+						};
+					});
 
-            services.AddOcelot(_cfg);
-        }
+			services.AddOcelot(_cfg);
+		}
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
-        {
-            var pathBase = _cfg["PATH_BASE"];
-            if (!string.IsNullOrEmpty(pathBase))
-            {
-                app.UsePathBase(pathBase);
-            }
+		public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+		{
+			var pathBase = _cfg["PATH_BASE"];
+			if (!string.IsNullOrEmpty(pathBase))
+			{
+				app.UsePathBase(pathBase);
+			}
 
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
+			if (env.IsDevelopment())
+			{
+				app.UseDeveloperExceptionPage();
+			}
 
-            loggerFactory.AddConsole(_cfg.GetSection("Logging"));
+			loggerFactory.AddConsole(_cfg.GetSection("Logging"));
 
-            app.UseCors("CorsPolicy");
+			app.UseCors("CorsPolicy");
 
-            app.UseOcelot().Wait();
-        }
-    }
+			app.UseOcelot().Wait();
+		}
+	}
 }