diff --git a/TimberWinR.ServiceHost/Program.cs b/TimberWinR.ServiceHost/Program.cs
index d3c1b69..3361999 100644
--- a/TimberWinR.ServiceHost/Program.cs
+++ b/TimberWinR.ServiceHost/Program.cs
@@ -21,6 +21,9 @@ namespace TimberWinR.ServiceHost
 {
     internal class Program
     {
+        const string KeyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
+        const string KeyName = "ImagePath";
+        
         private static void Main(string[] args)
         {
             Arguments arguments = new Arguments();
@@ -50,11 +53,8 @@ namespace TimberWinR.ServiceHost
                 hostConfigurator.SetServiceName("TimberWinR");
 
                 hostConfigurator.AfterInstall(() =>
-                {
-                    const string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
-                    const string keyName = "ImagePath";
-
-                    var currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
+                { 
+                    var currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
                     if (!string.IsNullOrEmpty(currentValue))
                     {
                         AddServiceParameter("-configFile", arguments.ConfigFile);
@@ -69,29 +69,25 @@ namespace TimberWinR.ServiceHost
 
         private static void AddServiceParameter(string paramName, string value)
         {
-            string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
-            string keyName = "ImagePath";
-
-            string currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
+         
+            string currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
 
             if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0} ", paramName)))           
             {
                 currentValue += string.Format(" {0} \"{1}\"", paramName, value.Replace("\\\\", "\\"));               
-                Registry.SetValue(keyPath, keyName, currentValue);               
+                Registry.SetValue(KeyPath, KeyName, currentValue);               
             }
         }
 
         private static void AddServiceParameter(string paramName, int value)
         {
-            string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
-            string keyName = "ImagePath";
-
-            string currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
+    
+            string currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
 
             if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0}:", paramName)))
             {
                 currentValue += string.Format(" {0}:{1}", paramName, value);
-                Registry.SetValue(keyPath, keyName, currentValue);
+                Registry.SetValue(KeyPath, KeyName, currentValue);
             }
         }
 
diff --git a/TimberWinR/Diagnostics/Diagnostics.cs b/TimberWinR/Diagnostics/Diagnostics.cs
index 00b2636..6b926a7 100644
--- a/TimberWinR/Diagnostics/Diagnostics.cs
+++ b/TimberWinR/Diagnostics/Diagnostics.cs
@@ -106,7 +106,7 @@ namespace TimberWinR.Diagnostics
             }
             catch (Exception ex)
             {
-                LogManager.GetCurrentClassLogger().Error("Tcp Exception", ex);
+                LogManager.GetCurrentClassLogger().Error(ex);
             }
 
         }
diff --git a/TimberWinR/Inputs/InputListener.cs b/TimberWinR/Inputs/InputListener.cs
index 52bd23f..b2b36b3 100644
--- a/TimberWinR/Inputs/InputListener.cs
+++ b/TimberWinR/Inputs/InputListener.cs
@@ -70,7 +70,7 @@ namespace TimberWinR.Inputs
             }
             catch (Exception ex)
             {
-                LogManager.GetCurrentClassLogger().Error("Error Deleting Checkpoint File", ex);
+                LogManager.GetCurrentClassLogger().Error(ex);
             }          
         }
 
diff --git a/TimberWinR/Inputs/TcpInputListener.cs b/TimberWinR/Inputs/TcpInputListener.cs
index a321368..3734059 100644
--- a/TimberWinR/Inputs/TcpInputListener.cs
+++ b/TimberWinR/Inputs/TcpInputListener.cs
@@ -117,7 +117,7 @@ namespace TimberWinR.Inputs
             }
             catch (Exception ex)
             {
-                LogManager.GetCurrentClassLogger().Error("Tcp Exception", ex);
+                LogManager.GetCurrentClassLogger().Error(ex);
             }
 
             if (clientStream != null)
diff --git a/TimberWinR/Inputs/WindowsEvtInputListener.cs b/TimberWinR/Inputs/WindowsEvtInputListener.cs
index 6d357c5..ad40629 100644
--- a/TimberWinR/Inputs/WindowsEvtInputListener.cs
+++ b/TimberWinR/Inputs/WindowsEvtInputListener.cs
@@ -116,7 +116,7 @@ namespace TimberWinR.Inputs
                 }
                 catch (Exception ex)
                 {
-                    LogManager.GetCurrentClassLogger().Error("WindowsEventListener", ex);
+                    LogManager.GetCurrentClassLogger().Error(ex);
                     firstQuery = true;
                     oLogQuery = new LogQuery();
                 }