diff --git a/src/Orchard/Environment/DefaultOrchardShell.cs b/src/Orchard/Environment/DefaultOrchardShell.cs
index 91379dce8..400c0399f 100644
--- a/src/Orchard/Environment/DefaultOrchardShell.cs
+++ b/src/Orchard/Environment/DefaultOrchardShell.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Autofac.Features.OwnedInstances;
 using Microsoft.Owin.Builder;
 using Orchard.Environment.Configuration;
@@ -12,7 +11,6 @@ using Orchard.Owin;
 using Orchard.Tasks;
 using Orchard.UI;
 using Orchard.WebApi.Routes;
-using Owin;
 using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider;
 
 namespace Orchard.Environment {
@@ -37,6 +35,7 @@ namespace Orchard.Environment {
             ISweepGenerator sweepGenerator,
             IEnumerable<IOwinMiddlewareProvider> owinMiddlewareProviders,
             ShellSettings shellSettings) {
+
             _eventsFactory = eventsFactory;
             _routeProviders = routeProviders;
             _httpRouteProviders = httpRouteProviders;
@@ -53,7 +52,7 @@ namespace Orchard.Environment {
         public ILogger Logger { get; set; }
 
         public void Activate() {
-            IAppBuilder appBuilder = new AppBuilder();
+            var appBuilder = new AppBuilder();
             appBuilder.Properties["host.AppName"] = _shellSettings.Name;
 
             var orderedMiddlewares = _owinMiddlewareProviders
@@ -64,11 +63,10 @@ namespace Orchard.Environment {
                 middleware.Configure(appBuilder);
             }
 
-            // register the Orchard middleware after all others
+            // Register the Orchard middleware after all others.
             appBuilder.UseOrchard();
 
-            Func<IDictionary<string, object>, Task> pipeline = appBuilder.Build();
-
+            var pipeline = appBuilder.Build();
             var allRoutes = new List<RouteDescriptor>();
             allRoutes.AddRange(_routeProviders.SelectMany(provider => provider.GetRoutes()));
             allRoutes.AddRange(_httpRouteProviders.SelectMany(provider => provider.GetRoutes()));
@@ -79,16 +77,17 @@ namespace Orchard.Environment {
             using (var events = _eventsFactory()) {
                 events.Value.Activated();
             }
-
+            
             _sweepGenerator.Activate();
         }
 
         public void Terminate() {
             SafelyTerminate(() => {
-                       using (var events = _eventsFactory()) {
-                           SafelyTerminate(() => events.Value.Terminating());
-                       }
-                   });
+                using (var events = _eventsFactory()) {
+                    var localEvents = events;
+                    SafelyTerminate(() => localEvents.Value.Terminating());
+                }
+            });
 
             SafelyTerminate(() => _sweepGenerator.Terminate());
         }