diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
index a401759b3d..e879bcf886 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
@@ -62,9 +62,8 @@ namespace Microsoft.AspNetCore.StaticFiles
         /// <returns></returns>
         public Task Invoke(HttpContext context)
         {
-            PathString subpath;
             if (Helpers.IsGetOrHeadMethod(context.Request.Method)
-                && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out subpath))
+                && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out var subpath))
             {
                 var dirContents = _fileProvider.GetDirectoryContents(subpath.Value);
                 if (dirContents.Exists)
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
index 72b577dfcc..646774315d 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Builder
             : base(sharedOptions)
         {
             // Prioritized list
-            DefaultFileNames = new List<string>()
+            DefaultFileNames = new List<string>
             {
                 "default.htm",
                 "default.html",
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
index 71765d0459..0ac1258c83 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -79,11 +79,9 @@ namespace Microsoft.AspNetCore.StaticFiles
         public Task Invoke(HttpContext context)
         {
             // Check if the URL matches any expected paths
-            PathString subpath;
-            IDirectoryContents contents;
             if (Helpers.IsGetOrHeadMethod(context.Request.Method)
-                && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out subpath)
-                && TryGetDirectoryInfo(subpath, out contents))
+                && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out var subpath)
+                && TryGetDirectoryInfo(subpath, out var contents))
             {
                 // If the path matches a directory but does not end in a slash, redirect to add the slash.
                 // This prevents relative links from breaking.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
index f5024dcb23..501be2d71c 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
@@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 // it is not returned for 304, 412, and 416
                 _response.ContentLength = _length;
             }
-            _options.OnPrepareResponse(new StaticFileResponseContext()
+            _options.OnPrepareResponse(new StaticFileResponseContext
             {
                 Context = _context,
                 File = _fileInfo,
@@ -360,8 +360,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 return;
             }
 
-            long start, length;
-            _responseHeaders.ContentRange = ComputeContentRange(_range, out start, out length);
+            _responseHeaders.ContentRange = ComputeContentRange(_range, out var start, out var length);
             _response.ContentLength = length;
             ApplyResponseHeaders(Constants.Status206PartialContent);
 
diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
index d1776fd1a4..268accc699 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
@@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
             using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel)))
             {
-                using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) })
+                using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) })
                 {
                     var response = await client.GetAsync("TestDocument.txt");
 
@@ -55,14 +55,14 @@ namespace Microsoft.AspNetCore.StaticFiles
 
             using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel)))
             {
-                using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) })
+                using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) })
                 {
                     var last = File.GetLastWriteTimeUtc(Path.Combine(AppContext.BaseDirectory, "TestDocument.txt"));
                     var response = await client.GetAsync("TestDocument.txt");
 
-                    var trimed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, TimeSpan.Zero).ToUniversalTime();
+                    var trimmed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, TimeSpan.Zero).ToUniversalTime();
 
-                    Assert.Equal(response.Content.Headers.LastModified.Value, trimed);
+                    Assert.Equal(response.Content.Headers.LastModified.Value, trimmed);
                 }
             }
         }
@@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 .ConfigureServices(services => services.AddSingleton(LoggerFactory))
                 .UseKestrel()
                 .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir))
-                .Configure(app => app.UseStaticFiles(new StaticFileOptions()
+                .Configure(app => app.UseStaticFiles(new StaticFileOptions
                 {
                     RequestPath = new PathString(baseUrl),
                 }));
@@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.StaticFiles
             {
                 var hostingEnvironment = server.Services.GetService<IHostingEnvironment>();
 
-                using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) })
+                using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) })
                 {
                     var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl));
                     var response = await client.GetAsync(requestUrl);
@@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 .ConfigureServices(services => services.AddSingleton(LoggerFactory))
                 .UseKestrel()
                 .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir))
-                .Configure(app => app.UseStaticFiles(new StaticFileOptions()
+                .Configure(app => app.UseStaticFiles(new StaticFileOptions
                 {
                     RequestPath = new PathString(baseUrl),
                 }));
@@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.StaticFiles
             {
                 var hostingEnvironment = server.Services.GetService<IHostingEnvironment>();
 
-                using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) })
+                using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) })
                 {
                     var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl));
                     var request = new HttpRequestMessage(HttpMethod.Head, requestUrl);
@@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.StaticFiles
         {
             var interval = TimeSpan.FromSeconds(15);
             var requestReceived = new ManualResetEvent(false);
-            var requestCacelled = new ManualResetEvent(false);
+            var requestCancelled = new ManualResetEvent(false);
             var responseComplete = new ManualResetEvent(false);
             Exception exception = null;
             var builder = new WebHostBuilder()
@@ -194,7 +194,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                         try
                         {
                             requestReceived.Set();
-                            Assert.True(requestCacelled.WaitOne(interval), "not cancelled");
+                            Assert.True(requestCancelled.WaitOne(interval), "not cancelled");
                             Assert.True(context.RequestAborted.WaitHandle.WaitOne(interval), "not aborted");
                             await next();
                         }
@@ -224,7 +224,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
                 socket.LingerState = new LingerOption(true, 0);
                 socket.Dispose();
-                requestCacelled.Set();
+                requestCancelled.Set();
 
                 Assert.True(responseComplete.WaitOne(interval), "not completed");
                 Assert.Null(exception);
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
index 862346a9d8..7c70ce4551 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
@@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
         [Theory]
         [MemberData(nameof(SupportedMethods))]
-        public async Task IfMatchShouldBeServedForAstrisk(HttpMethod method)
+        public async Task IfMatchShouldBeServedForAsterisk(HttpMethod method)
         {
             TestServer server = StaticFilesTestServer.Create(app => app.UseFileServer());
             var req = new HttpRequestMessage(method, "http://localhost/SubFolder/extra.xml");
@@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
             DateTimeOffset lastModified = resp1.Content.Headers.LastModified.Value;
             DateTimeOffset pastDate = lastModified.AddHours(-1);
-            DateTimeOffset furtureDate = lastModified.AddHours(1);
+            DateTimeOffset futureDate = lastModified.AddHours(1);
 
             HttpResponseMessage resp2 = await server
                 .CreateRequest("/SubFolder/extra.xml")
@@ -247,7 +247,7 @@ namespace Microsoft.AspNetCore.StaticFiles
             HttpResponseMessage resp4 = await server
                 .CreateRequest("/SubFolder/extra.xml")
                 .AddHeader("If-None-Match", "\"fake\"")
-                .And(req => req.Headers.IfModifiedSince = furtureDate)
+                .And(req => req.Headers.IfModifiedSince = futureDate)
                 .SendAsync(method.Method);
 
             Assert.Equal(HttpStatusCode.OK, resp2.StatusCode);
@@ -322,7 +322,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
         [Theory]
         [MemberData(nameof(SupportedMethods))]
-        public async Task SuppportsIfModifiedDateFormats(HttpMethod method)
+        public async Task SupportsIfModifiedDateFormats(HttpMethod method)
         {
             TestServer server = StaticFilesTestServer.Create(app => app.UseFileServer());
             HttpResponseMessage res1 = await server
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
index 1095b64350..5df588c802 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
@@ -16,11 +16,10 @@ namespace Microsoft.AspNetCore.StaticFiles
         }
 
         [Fact]
-        public void KnownExtensionsReturnTrye()
+        public void KnownExtensionsReturnType()
         {
             var provider = new FileExtensionContentTypeProvider();
-            string contentType;
-            Assert.True(provider.TryGetContentType("known.txt", out contentType));
+            Assert.True(provider.TryGetContentType("known.txt", out var contentType));
             Assert.Equal("text/plain", contentType);
         }
 
@@ -36,8 +35,7 @@ namespace Microsoft.AspNetCore.StaticFiles
         public void DashedExtensionsShouldBeMatched()
         {
             var provider = new FileExtensionContentTypeProvider();
-            string contentType;
-            Assert.True(provider.TryGetContentType("known.dvr-ms", out contentType));
+            Assert.True(provider.TryGetContentType("known.dvr-ms", out var contentType));
             Assert.Equal("video/x-ms-dvr", contentType);
         }
 
@@ -45,8 +43,7 @@ namespace Microsoft.AspNetCore.StaticFiles
         public void BothSlashFormatsAreUnderstood()
         {
             var provider = new FileExtensionContentTypeProvider();
-            string contentType;
-            Assert.True(provider.TryGetContentType(@"/first/example.txt", out contentType));
+            Assert.True(provider.TryGetContentType(@"/first/example.txt", out var contentType));
             Assert.Equal("text/plain", contentType);
             Assert.True(provider.TryGetContentType(@"\second\example.txt", out contentType));
             Assert.Equal("text/plain", contentType);
@@ -56,8 +53,7 @@ namespace Microsoft.AspNetCore.StaticFiles
         public void DotsInDirectoryAreIgnored()
         {
             var provider = new FileExtensionContentTypeProvider();
-            string contentType;
-            Assert.True(provider.TryGetContentType(@"/first.css/example.txt", out contentType));
+            Assert.True(provider.TryGetContentType(@"/first.css/example.txt", out var contentType));
             Assert.Equal("text/plain", contentType);
             Assert.True(provider.TryGetContentType(@"\second.css\example.txt", out contentType));
             Assert.Equal("text/plain", contentType);
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
index e50557f277..4601522333 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
@@ -169,12 +169,12 @@ namespace Microsoft.AspNetCore.StaticFiles
 
         private async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl)
         {
-            using (var fileProvder = new PhysicalFileProvider(Path.Combine(AppContext.BaseDirectory, baseDir)))
+            using (var fileProvider = new PhysicalFileProvider(Path.Combine(AppContext.BaseDirectory, baseDir)))
             {
                 var server = StaticFilesTestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions
                 {
                     RequestPath = new PathString(baseUrl),
-                    FileProvider = fileProvder
+                    FileProvider = fileProvider
                 }));
                 var response = await server.CreateRequest(requestUrl).GetAsync();
 
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
index a1da44fd38..f4fca87a36 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
@@ -70,8 +70,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
             public IFileInfo GetFileInfo(string subpath)
             {
-                IFileInfo result;
-                if (_files.TryGetValue(subpath, out result))
+                if (_files.TryGetValue(subpath, out var result))
                 {
                     return result;
                 }
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index 31c6894d2b..2c5c30df63 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -101,9 +101,9 @@ namespace Microsoft.AspNetCore.StaticFiles
                 var response = await server.CreateRequest("TestDocument.txt").GetAsync();
 
                 var last = fileInfo.LastModified;
-                var trimed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Offset).ToUniversalTime();
+                var trimmed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Offset).ToUniversalTime();
 
-                Assert.Equal(response.Content.Headers.LastModified.Value, trimed);
+                Assert.Equal(response.Content.Headers.LastModified.Value, trimmed);
             }
         }