1 files changed, 22 insertions, 26 deletions
diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
index bc367403b..741d2d6c1 100644
--- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
@@ -15,42 +15,42 @@ namespace MediaBrowser.Common.Net.Handlers
             return false;
         }
 
-        private string _Path;
+        private string _path;
         public virtual string Path
         {
             get
             {
-                if (!string.IsNullOrWhiteSpace(_Path))
+                if (!string.IsNullOrWhiteSpace(_path))
                 {
-                    return _Path;
+                    return _path;
                 }
 
                 return QueryString["path"];
             }
             set
             {
-                _Path = value;
+                _path = value;
             }
         }
 
-        private bool _SourceStreamEnsured = false;
-        private Stream _SourceStream = null;
+        private bool _sourceStreamEnsured;
+        private Stream _sourceStream;
         private Stream SourceStream
         {
             get
             {
                 EnsureSourceStream();
-                return _SourceStream;
+                return _sourceStream;
             }
         }
 
         private void EnsureSourceStream()
         {
-            if (!_SourceStreamEnsured)
+            if (!_sourceStreamEnsured)
             {
                 try
                 {
-                    _SourceStream = File.OpenRead(Path);
+                    _sourceStream = File.OpenRead(Path);
                 }
                 catch (FileNotFoundException ex)
                 {
@@ -69,7 +69,7 @@ namespace MediaBrowser.Common.Net.Handlers
                 }
                 finally
                 {
-                    _SourceStreamEnsured = true;
+                    _sourceStreamEnsured = true;
                 }
             }
         }
@@ -116,12 +116,12 @@ namespace MediaBrowser.Common.Net.Handlers
                 value = File.GetLastWriteTimeUtc(Path);
             }
 
-            return Task.FromResult<DateTime?>(value);
+            return Task.FromResult(value);
         }
 
         public override Task<string> GetContentType()
         {
-            return Task.FromResult<string>(MimeTypes.GetMimeType(Path));
+            return Task.FromResult(MimeTypes.GetMimeType(Path));
         }
 
         protected override Task PrepareResponse()
@@ -141,21 +141,17 @@ namespace MediaBrowser.Common.Net.Handlers
                 {
                     return ServeCompleteRangeRequest(requestedRange, stream);
                 }
-                else if (TotalContentLength.HasValue)
+                if (TotalContentLength.HasValue)
                 {
                     // This will have to buffer a portion of the content into memory
                     return ServePartialRangeRequestWithKnownTotalContentLength(requestedRange, stream);
                 }
-                else
-                {
-                    // This will have to buffer the entire content into memory
-                    return ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream);
-                }
-            }
-            else
-            {
-                return SourceStream.CopyToAsync(stream);
+
+                // This will have to buffer the entire content into memory
+                return ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream);
             }
+
+            return SourceStream.CopyToAsync(stream);
         }
 
         protected override void DisposeResponseStream()
@@ -249,9 +245,9 @@ namespace MediaBrowser.Common.Net.Handlers
 
             if (count == null)
             {
-                byte[] buffer = new byte[16 * 1024];
+                var buffer = new byte[16 * 1024];
 
-                using (MemoryStream ms = new MemoryStream())
+                using (var ms = new MemoryStream())
                 {
                     int read;
                     while ((read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0)
@@ -263,9 +259,9 @@ namespace MediaBrowser.Common.Net.Handlers
             }
             else
             {
-                byte[] buffer = new byte[count.Value];
+                var buffer = new byte[count.Value];
 
-                using (MemoryStream ms = new MemoryStream())
+                using (var ms = new MemoryStream())
                 {
                     int read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);