diff --git a/NzbDrone/Application.cs b/NzbDrone/Application.cs
index 0c5b7636a..2e34bae12 100644
--- a/NzbDrone/Application.cs
+++ b/NzbDrone/Application.cs
@@ -11,15 +11,17 @@ namespace NzbDrone
         private static readonly Logger Logger = LogManager.GetLogger("Host.App");
 
         private readonly ConfigProvider _configProvider;
-        private readonly WebClient _webClient;
-        private readonly IISProvider _iisProvider;
         private readonly ConsoleProvider _consoleProvider;
         private readonly DebuggerProvider _debuggerProvider;
         private readonly EnviromentProvider _enviromentProvider;
+        private readonly IISProvider _iisProvider;
         private readonly ProcessProvider _processProvider;
+        private readonly WebClient _webClient;
 
-        public Application(ConfigProvider configProvider, WebClient webClient, IISProvider iisProvider, ConsoleProvider consoleProvider,
-            DebuggerProvider debuggerProvider, EnviromentProvider enviromentProvider, ProcessProvider processProvider)
+        public Application(ConfigProvider configProvider, WebClient webClient, IISProvider iisProvider,
+                           ConsoleProvider consoleProvider,
+                           DebuggerProvider debuggerProvider, EnviromentProvider enviromentProvider,
+                           ProcessProvider processProvider)
         {
             _configProvider = configProvider;
             _webClient = webClient;
@@ -33,7 +35,6 @@ namespace NzbDrone
             _configProvider.CreateDefaultConfigFile();
             Logger.Info("Starting NZBDrone. Start-up Path:'{0}'", _configProvider.ApplicationRoot);
             Thread.CurrentThread.Name = "Host";
-
         }
 
         public void Start()
@@ -71,8 +72,6 @@ namespace NzbDrone
 
         public void Stop()
         {
-
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/NzbDrone/NzbDroneService.cs b/NzbDrone/NzbDroneService.cs
index d0b140442..1fa341161 100644
--- a/NzbDrone/NzbDroneService.cs
+++ b/NzbDrone/NzbDroneService.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceProcess;
-using System.Text;
+using System.ServiceProcess;
 
 namespace NzbDrone
 {
-    class NzbDroneService : ServiceBase
+    internal class NzbDroneService : ServiceBase
     {
-
         protected override void OnStart(string[] args)
         {
             base.OnStart(args);
@@ -18,6 +13,5 @@ namespace NzbDrone
         {
             base.OnStop();
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/ProcessAttacher.cs b/NzbDrone/ProcessAttacher.cs
index 851c8b6fb..edbe4af75 100644
--- a/NzbDrone/ProcessAttacher.cs
+++ b/NzbDrone/ProcessAttacher.cs
@@ -19,7 +19,7 @@ namespace NzbDrone
         public static void Attach()
         {
             DTE2 dte2;
-            dte2 = (DTE2)Marshal.
+            dte2 = (DTE2) Marshal.
                               GetActiveObject("VisualStudio.DTE.10.0");
 
             var pa = new ProcessAttacher(dte2, "iisexpress", 10);
@@ -27,7 +27,6 @@ namespace NzbDrone
             return;
 
             // Get an instance of the currently running Visual Studio IDE.
-
         }
 
         #region private
@@ -88,9 +87,9 @@ namespace NzbDrone
 
         private AttachResult PessimisticAttach(AttachType attachType)
         {
-            AttachResult res = Attach(attachType);
+            var res = Attach(attachType);
 
-            DateTime timeout = DateTime.Now.AddSeconds(_waitTimeout);
+            var timeout = DateTime.Now.AddSeconds(_waitTimeout);
 
             while (res == AttachResult.NotRunning && timeout > DateTime.Now)
             {
@@ -102,8 +101,6 @@ namespace NzbDrone
 
         private bool IsBeingDebugged()
         {
-
-
             if (_dte.Debugger.DebuggedProcesses != null)
             {
                 foreach (Process process in _dte.Debugger.DebuggedProcesses)
diff --git a/NzbDrone/ProcessInfo.cs b/NzbDrone/ProcessInfo.cs
index 06f3ec607..5a287b970 100644
--- a/NzbDrone/ProcessInfo.cs
+++ b/NzbDrone/ProcessInfo.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
 
 namespace NzbDrone
 {
@@ -13,6 +9,5 @@ namespace NzbDrone
         public string StartPath { get; set; }
 
         public bool HasExited { get; set; }
-
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/Program.cs b/NzbDrone/Program.cs
index 6dd899b29..5c391cd5a 100644
--- a/NzbDrone/Program.cs
+++ b/NzbDrone/Program.cs
@@ -28,7 +28,6 @@ namespace NzbDrone
                 Console.WriteLine("Starting Console.");
                 Kernel.Get<MonitoringProvider>().Start();
                 Kernel.Get<Application>().Start();
-               
             }
             catch (Exception e)
             {
diff --git a/NzbDrone/Properties/AssemblyInfo.cs b/NzbDrone/Properties/AssemblyInfo.cs
index 75ee50ae9..c1e66ade6 100644
--- a/NzbDrone/Properties/AssemblyInfo.cs
+++ b/NzbDrone/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.5.0.*")]
+[assembly: AssemblyVersion("0.5.0.*")]
\ No newline at end of file
diff --git a/NzbDrone/Providers/ConfigProvider.cs b/NzbDrone/Providers/ConfigProvider.cs
index 4a4f3c5f9..fe1524da6 100644
--- a/NzbDrone/Providers/ConfigProvider.cs
+++ b/NzbDrone/Providers/ConfigProvider.cs
@@ -88,10 +88,10 @@ namespace NzbDrone.Providers
                     ));
 
             bindings.Add(
-            new XElement("binding",
-                         new XAttribute("protocol", "http"),
-                         new XAttribute("bindingInformation", String.Format("*:{0}:", Port))
-                ));
+                new XElement("binding",
+                             new XAttribute("protocol", "http"),
+                             new XAttribute("bindingInformation", String.Format("*:{0}:", Port))
+                    ));
 
             configXml.Save(configPath);
         }
@@ -112,10 +112,10 @@ namespace NzbDrone.Providers
             var xDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
 
             xDoc.Add(new XElement("Config",
-                                    new XElement("Port", 8989),
-                                    new XElement("LaunchBrowser", true)
-                                 )
-                    );
+                                  new XElement("Port", 8989),
+                                  new XElement("LaunchBrowser", true)
+                         )
+                );
 
             xDoc.Save(ConfigFile);
         }
@@ -130,7 +130,7 @@ namespace NzbDrone.Providers
             if (parent != null)
                 parentContainer = config.Descendants(parent).Single();
 
-            var value = parentContainer.Descendants(key).Single().Value;
+            string value = parentContainer.Descendants(key).Single().Value;
 
             return value;
         }
diff --git a/NzbDrone/Providers/ConsoleProvider.cs b/NzbDrone/Providers/ConsoleProvider.cs
index 911cc36b8..d49586ab1 100644
--- a/NzbDrone/Providers/ConsoleProvider.cs
+++ b/NzbDrone/Providers/ConsoleProvider.cs
@@ -12,4 +12,4 @@ namespace NzbDrone.Providers
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/Providers/DebuggerProvider.cs b/NzbDrone/Providers/DebuggerProvider.cs
index ce7d07ca4..d37d25e85 100644
--- a/NzbDrone/Providers/DebuggerProvider.cs
+++ b/NzbDrone/Providers/DebuggerProvider.cs
@@ -7,7 +7,6 @@ namespace NzbDrone.Providers
 {
     public class DebuggerProvider
     {
-
         private static readonly Logger Logger = LogManager.GetLogger("Host.DebuggerProvider");
 
 
@@ -18,7 +17,7 @@ namespace NzbDrone.Providers
             {
                 Logger.Info("Trying to attach to debugger");
 
-                var count = 0;
+                int count = 0;
 
                 while (true)
                 {
@@ -38,14 +37,10 @@ namespace NzbDrone.Providers
                         }
 
                         Thread.Sleep(100);
-
                     }
                 }
             }
 #endif
         }
-
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/Providers/EnviromentProvider.cs b/NzbDrone/Providers/EnviromentProvider.cs
index ffedeb2fb..45c914342 100644
--- a/NzbDrone/Providers/EnviromentProvider.cs
+++ b/NzbDrone/Providers/EnviromentProvider.cs
@@ -14,4 +14,4 @@ namespace NzbDrone.Providers
             get { return Environment.UserInteractive; }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/Providers/IISProvider.cs b/NzbDrone/Providers/IISProvider.cs
index b5027e01d..14b042c81 100644
--- a/NzbDrone/Providers/IISProvider.cs
+++ b/NzbDrone/Providers/IISProvider.cs
@@ -8,10 +8,10 @@ namespace NzbDrone.Providers
 {
     public class IISProvider
     {
-        private readonly ConfigProvider _configProvider;
-        private readonly ProcessProvider _processProvider;
         private static readonly Logger IISLogger = LogManager.GetLogger("Host.IISExpress");
         private static readonly Logger Logger = LogManager.GetLogger("Host.IISProvider");
+        private readonly ConfigProvider _configProvider;
+        private readonly ProcessProvider _processProvider;
 
 
         [Inject]
@@ -19,12 +19,10 @@ namespace NzbDrone.Providers
         {
             _configProvider = configProvider;
             _processProvider = processProvider;
-
         }
 
         public IISProvider()
         {
-
         }
 
         public string AppUrl
@@ -141,7 +139,5 @@ namespace NzbDrone.Providers
 
             return info.FullName.Trim('/', '\\', ' ').ToLower();
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/NzbDrone/Providers/MonitoringProvider.cs b/NzbDrone/Providers/MonitoringProvider.cs
index 09a27fd41..55c80d0af 100644
--- a/NzbDrone/Providers/MonitoringProvider.cs
+++ b/NzbDrone/Providers/MonitoringProvider.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Net;
 using System.Runtime.Remoting;
 using System.Timers;
 using NLog;
@@ -14,15 +13,22 @@ namespace NzbDrone.Providers
 
         private readonly IISProvider _iisProvider;
         private readonly ProcessProvider _processProvider;
+        private readonly WebClientProvider _webClientProvider;
 
         private int _pingFailCounter;
         private Timer _pingTimer;
 
         [Inject]
-        public MonitoringProvider(ProcessProvider processProvider, IISProvider iisProvider)
+        public MonitoringProvider(ProcessProvider processProvider, IISProvider iisProvider,
+                                  WebClientProvider webClientProvider)
         {
             _processProvider = processProvider;
             _iisProvider = iisProvider;
+            _webClientProvider = webClientProvider;
+        }
+
+        public MonitoringProvider()
+        {
         }
 
         public void Start()
@@ -36,15 +42,11 @@ namespace NzbDrone.Providers
             prioCheckTimer.Elapsed += EnsurePriority;
             prioCheckTimer.Enabled = true;
 
-            _pingTimer = new Timer(60000) { AutoReset = true };
+            _pingTimer = new Timer(60000) {AutoReset = true};
             _pingTimer.Elapsed += (PingServer);
             _pingTimer.Start();
         }
 
-        public MonitoringProvider()
-        {
-        }
-
 
         public virtual void EnsurePriority(object sender, ElapsedEventArgs e)
         {
@@ -68,16 +70,18 @@ namespace NzbDrone.Providers
 
             try
             {
-                string response = new WebClient().DownloadString(_iisProvider.AppUrl + "/health");
+                string response = _webClientProvider.DownloadString(_iisProvider.AppUrl + "/health");
 
                 if (!response.Contains("OK"))
                 {
                     throw new ServerException("Health services responded with an invalid response.");
                 }
+
                 if (_pingFailCounter > 0)
                 {
                     Logger.Info("Application pool has been successfully recovered.");
                 }
+
                 _pingFailCounter = 0;
             }
             catch (Exception ex)
diff --git a/NzbDrone/Providers/ProcessProvider.cs b/NzbDrone/Providers/ProcessProvider.cs
index 0c7ae7ec2..9b7855673 100644
--- a/NzbDrone/Providers/ProcessProvider.cs
+++ b/NzbDrone/Providers/ProcessProvider.cs
@@ -76,11 +76,11 @@ namespace NzbDrone.Providers
             if (process == null) return null;
 
             return new ProcessInfo
-                           {
-                               Id = process.Id,
-                               Priority = process.PriorityClass,
-                               StartPath = process.MainModule.FileName
-                           };
+                       {
+                           Id = process.Id,
+                           Priority = process.PriorityClass,
+                           StartPath = process.MainModule.FileName
+                       };
         }
     }
-}
+}
\ No newline at end of file
diff --git a/NzbDrone/Providers/ServiceProvider.cs b/NzbDrone/Providers/ServiceProvider.cs
index e627e60e4..63d54bb2f 100644
--- a/NzbDrone/Providers/ServiceProvider.cs
+++ b/NzbDrone/Providers/ServiceProvider.cs
@@ -14,11 +14,11 @@ namespace NzbDrone.Providers
 
         private static readonly Logger Logger = LogManager.GetLogger("Host.ServiceManager");
 
-        
+
         public bool ServiceExist(string name)
         {
             return
-                System.ServiceProcess.ServiceController.GetServices().Any(
+                ServiceController.GetServices().Any(
                     s => String.Equals(s.ServiceName, name, StringComparison.InvariantCultureIgnoreCase));
         }
 
@@ -36,7 +36,7 @@ namespace NzbDrone.Providers
             var serviceInstaller = new ServiceInstaller();
 
 
-            String[] cmdline = { @"/assemblypath=" + Assembly.GetExecutingAssembly().Location };
+            String[] cmdline = {@"/assemblypath=" + Assembly.GetExecutingAssembly().Location};
 
             var context = new InstallContext("service_install.log", cmdline);
             serviceInstaller.Context = context;
diff --git a/NzbDrone/Providers/WebClientProvider.cs b/NzbDrone/Providers/WebClientProvider.cs
index 872b0f6e2..3ffa1e920 100644
--- a/NzbDrone/Providers/WebClientProvider.cs
+++ b/NzbDrone/Providers/WebClientProvider.cs
@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
+using System.Net;
 
 namespace NzbDrone.Providers
 {
     public class WebClientProvider
     {
-
         public virtual string DownloadString(string url)
         {
             return new WebClient().DownloadString(url);
         }
     }
-}
+}
\ No newline at end of file