diff --git a/ICD.Common.Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs
index eaae550..7a691e1 100644
--- a/ICD.Common.Utils/PathUtils.cs
+++ b/ICD.Common.Utils/PathUtils.cs
@@ -6,188 +6,185 @@ using ICD.Common.Utils.IO;
 
 namespace ICD.Common.Utils
 {
-    /// <summary>
-    /// Provides util methods for working with file/directory paths.
-    /// </summary>
-    public static class PathUtils
-    {
-        #region Properties
+	/// <summary>
+	/// Provides util methods for working with file/directory paths.
+	/// </summary>
+	public static class PathUtils
+	{
+		#region Properties
 
-        /// <summary>
-        /// Gets the path to the root directory of the processor.
-        /// </summary>
-        [PublicAPI]
-        public static string RootPath { get { return IcdDirectory.GetDirectoryRoot("\\"); } }
+		/// <summary>
+		/// Gets the path to the root directory of the processor.
+		/// </summary>
+		[PublicAPI]
+		public static string RootPath { get { return IcdDirectory.GetDirectoryRoot("\\"); } }
 
-        /// <summary>
-        /// Gets the path to the program directory
-        /// </summary>
-        [PublicAPI]
-        public static string ProgramPath
-        {
-            get { return IcdDirectory.GetApplicationDirectory(); }
-        }
+		/// <summary>
+		/// Gets the path to the program directory
+		/// </summary>
+		[PublicAPI]
+		public static string ProgramPath { get { return IcdDirectory.GetApplicationDirectory(); } }
 
-        /// <summary>
-        /// Gets the path to the NVRAM directory.
-        /// </summary>
-        [PublicAPI]
-        public static string NvramPath { get { return Join(RootPath, "NVRAM"); } }
+		/// <summary>
+		/// Gets the path to the NVRAM directory.
+		/// </summary>
+		[PublicAPI]
+		public static string NvramPath { get { return Join(RootPath, "NVRAM"); } }
 
-        /// <summary>
-        /// Returns the absolute path to the configuration directory.
-        /// </summary>
-        /// <value></value>
-        [PublicAPI]
-        public static string ProgramConfigPath
-        {
-            get
-            {
-                string directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber);
-                return Join(NvramPath, directoryName);
-            }
-        }
+		/// <summary>
+		/// Returns the absolute path to the configuration directory.
+		/// </summary>
+		/// <value></value>
+		[PublicAPI]
+		public static string ProgramConfigPath
+		{
+			get
+			{
+				string directoryName = string.Format("Program{0:D2}Config", ProgramUtils.ProgramNumber);
+				return Join(NvramPath, directoryName);
+			}
+		}
 
-        /// <summary>
-        /// Returns the absolute path to the common configuration directory.
-        /// </summary>
-        [PublicAPI]
-        public static string CommonConfigPath { get { return Join(NvramPath, "CommonConfig"); } }
+		/// <summary>
+		/// Returns the absolute path to the common configuration directory.
+		/// </summary>
+		[PublicAPI]
+		public static string CommonConfigPath { get { return Join(NvramPath, "CommonConfig"); } }
 
-        /// <summary>
-        /// Returns the absolute path to the common config library directory.
-        /// </summary>
-        [PublicAPI]
-        public static string CommonLibPath { get { return Join(CommonConfigPath, "Lib"); } }
+		/// <summary>
+		/// Returns the absolute path to the common config library directory.
+		/// </summary>
+		[PublicAPI]
+		public static string CommonLibPath { get { return Join(CommonConfigPath, "Lib"); } }
 
-        /// <summary>
-        /// Returns the absolute path to the program config library directory.
-        /// </summary>
-        [PublicAPI]
-        public static string ProgramLibPath { get { return Join(ProgramConfigPath, "Lib"); } }
+		/// <summary>
+		/// Returns the absolute path to the program config library directory.
+		/// </summary>
+		[PublicAPI]
+		public static string ProgramLibPath { get { return Join(ProgramConfigPath, "Lib"); } }
 
-        #endregion
+		#endregion
 
-        #region Methods
+		#region Methods
 
-        /// <summary>
-        /// Creates a path from the given path nodes.
-        /// </summary>
-        /// <param name="items"></param>
-        /// <returns></returns>
-        public static string Join(params string[] items)
-        {
-            return items.Length > 1
-                       ? items.Skip(1).Aggregate(items.First(), IcdPath.Combine)
-                       : items.FirstOrDefault(string.Empty);
-        }
+		/// <summary>
+		/// Creates a path from the given path nodes.
+		/// </summary>
+		/// <param name="items"></param>
+		/// <returns></returns>
+		public static string Join(params string[] items)
+		{
+			return items.Length > 1
+				       ? items.Skip(1).Aggregate(items.First(), IcdPath.Combine)
+				       : items.FirstOrDefault(string.Empty);
+		}
 
-        /// <summary>
-        /// Gets the full path for the given path.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static string GetFullPath(string path)
-        {
-            return Join(IcdDirectory.GetApplicationDirectory(), path);
-        }
+		/// <summary>
+		/// Gets the full path for the given path.
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		public static string GetFullPath(string path)
+		{
+			return Join(IcdDirectory.GetApplicationDirectory(), path);
+		}
 
-        /// <summary>
-        /// Replaces the filename while leaving the directory and extension intact.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="newName"></param>
-        /// <returns></returns>
-        public static string ChangeFilenameWithoutExt(string path, string newName)
-        {
-            string dir = IcdPath.GetDirectoryName(path);
-            string ext = IcdPath.GetExtension(path);
+		/// <summary>
+		/// Replaces the filename while leaving the directory and extension intact.
+		/// </summary>
+		/// <param name="path"></param>
+		/// <param name="newName"></param>
+		/// <returns></returns>
+		public static string ChangeFilenameWithoutExt(string path, string newName)
+		{
+			string dir = IcdPath.GetDirectoryName(path);
+			string ext = IcdPath.GetExtension(path);
 
-            return Join(dir, newName + ext);
-        }
+			return Join(dir, newName + ext);
+		}
 
-        /// <summary>
-        /// Removes the extension from the given path.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static string GetPathWithoutExtension(string path)
-        {
-            string dir = IcdPath.GetDirectoryName(path);
-            string filename = IcdPath.GetFileNameWithoutExtension(path);
+		/// <summary>
+		/// Removes the extension from the given path.
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		public static string GetPathWithoutExtension(string path)
+		{
+			string dir = IcdPath.GetDirectoryName(path);
+			string filename = IcdPath.GetFileNameWithoutExtension(path);
 
-            return Join(dir, filename);
-        }
+			return Join(dir, filename);
+		}
 
-        /// <summary>
-        /// Recurses over the file paths at the given directory.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static IEnumerable<string> RecurseFilePaths(string path)
-        {
-            if (!IcdDirectory.Exists(path))
-                return Enumerable.Empty<string>();
+		/// <summary>
+		/// Recurses over the file paths at the given directory.
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		public static IEnumerable<string> RecurseFilePaths(string path)
+		{
+			if (!IcdDirectory.Exists(path))
+				return Enumerable.Empty<string>();
 
-            return RecursionUtils.BreadthFirstSearch(path, IcdDirectory.GetDirectories)
-                                 .SelectMany(p => IcdDirectory.GetFiles(p));
-        }
+			return RecursionUtils.BreadthFirstSearch(path, IcdDirectory.GetDirectories)
+			                     .SelectMany(p => IcdDirectory.GetFiles(p));
+		}
 
-        /// <summary>
-        /// Searches the program config path, common config path, and application path to
-        /// find the first config that exists with the given local path.
-        /// </summary>
-        /// <param name="localPath"></param>
-        /// <returns></returns>
-        [PublicAPI]
-        public static string GetDefaultConfigPath(params string[] localPath)
-        {
-            string local = Join(localPath);
+		/// <summary>
+		/// Searches the program config path, common config path, and application path to
+		/// find the first config that exists with the given local path.
+		/// </summary>
+		/// <param name="localPath"></param>
+		/// <returns></returns>
+		[PublicAPI]
+		public static string GetDefaultConfigPath(params string[] localPath)
+		{
+			string local = Join(localPath);
 
-            // Program slot configuration
-            string programPath = GetProgramConfigPath(localPath);
-            if (PathExists(programPath))
-                return programPath;
+			// Program slot configuration
+			string programPath = GetProgramConfigPath(localPath);
+			if (PathExists(programPath))
+				return programPath;
 
-            // Common program configuration
-            string commonPath = GetCommonConfigPath(local);
-            if (PathExists(commonPath))
-                return commonPath;
+			// Common program configuration
+			string commonPath = GetCommonConfigPath(local);
+			if (PathExists(commonPath))
+				return commonPath;
 
-            return Join(IcdDirectory.GetApplicationDirectory(), local); // Installation defaults
-        }
+			return Join(IcdDirectory.GetApplicationDirectory(), local); // Installation defaults
+		}
 
-        /// <summary>
-        /// Appends the local path to the common config path.
-        /// </summary>
-        /// <returns></returns>
-        public static string GetCommonConfigPath(params string[] localPath)
-        {
-            string local = Join(localPath);
-            return Join(CommonConfigPath, local);
-        }
+		/// <summary>
+		/// Appends the local path to the common config path.
+		/// </summary>
+		/// <returns></returns>
+		public static string GetCommonConfigPath(params string[] localPath)
+		{
+			string local = Join(localPath);
+			return Join(CommonConfigPath, local);
+		}
 
-        /// <summary>
-        /// Appends the local path to the program config path.
-        /// </summary>
-        /// <returns></returns>
-        public static string GetProgramConfigPath(params string[] localPath)
-        {
-            string local = Join(localPath);
-            return Join(ProgramConfigPath, local);
-        }
+		/// <summary>
+		/// Appends the local path to the program config path.
+		/// </summary>
+		/// <returns></returns>
+		public static string GetProgramConfigPath(params string[] localPath)
+		{
+			string local = Join(localPath);
+			return Join(ProgramConfigPath, local);
+		}
 
-        /// <summary>
-        /// Returns true if the given path exists.
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        [PublicAPI]
-        public static bool PathExists(string path)
-        {
-            return IcdFile.Exists(path) || IcdDirectory.Exists(path);
-        }
+		/// <summary>
+		/// Returns true if the given path exists.
+		/// </summary>
+		/// <param name="path"></param>
+		/// <returns></returns>
+		[PublicAPI]
+		public static bool PathExists(string path)
+		{
+			return IcdFile.Exists(path) || IcdDirectory.Exists(path);
+		}
 
-        #endregion
-    }
+		#endregion
+	}
 }
diff --git a/ICD.Common.Utils/RecursionUtils.cs b/ICD.Common.Utils/RecursionUtils.cs
index 4139a15..7708a17 100644
--- a/ICD.Common.Utils/RecursionUtils.cs
+++ b/ICD.Common.Utils/RecursionUtils.cs
@@ -135,7 +135,7 @@ namespace ICD.Common.Utils
 
 			// Edge case, root is the destination
 			foreach (T destination in
-					destinationsToBeProcessed.Where(destination => comparer.Equals(root, destination)))
+				destinationsToBeProcessed.Where(destination => comparer.Equals(root, destination)))
 			{
 				destinationsProcessed.Add(destination);
 				pathsToReturn.Add(destination, new[] {root});
@@ -163,7 +163,7 @@ namespace ICD.Common.Utils
 
 					T closureNode = node;
 					foreach (T destination in
-							destinationsToBeProcessed.Where(destination => comparer.Equals(closureNode, destination)))
+						destinationsToBeProcessed.Where(destination => comparer.Equals(closureNode, destination)))
 					{
 						destinationsProcessed.Add(destination);
 						pathsToReturn.Add(destination, GetPath(destination, root, nodeParents, comparer).Reverse());
diff --git a/ICD.Common.Utils/Services/ServiceProvider.cs b/ICD.Common.Utils/Services/ServiceProvider.cs
index 8b3e7de..fd3bab6 100644
--- a/ICD.Common.Utils/Services/ServiceProvider.cs
+++ b/ICD.Common.Utils/Services/ServiceProvider.cs
@@ -308,9 +308,7 @@ namespace ICD.Common.Utils.Services
 				m_ServicesSection.Enter();
 
 				if (m_Services.ContainsKey(tService))
-				{
 					return false;
-				}
 
 				m_Services.Add(tService, service);
 			}
diff --git a/ICD.Common.Utils/StringUtils.cs b/ICD.Common.Utils/StringUtils.cs
index df05254..6086721 100644
--- a/ICD.Common.Utils/StringUtils.cs
+++ b/ICD.Common.Utils/StringUtils.cs
@@ -523,20 +523,18 @@ namespace ICD.Common.Utils
 			return text == null ? null : new string(text.Where(c => !Char.IsWhiteSpace(c)).ToArray());
 		}
 
-        /// <summary>
-        /// Returns true if the string is entirely whitespace characters, or empty, or null.
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
-	    public static bool IsNullOrWhitespace(string text)
-	    {
-            if (string.IsNullOrEmpty(text))
-            {
-                return true;
-            }
-	        var trimmed = text.Trim();
-	        return trimmed.Length == 0;
-	    }
+		/// <summary>
+		/// Returns true if the string is entirely whitespace characters, or empty, or null.
+		/// </summary>
+		/// <param name="text"></param>
+		/// <returns></returns>
+		public static bool IsNullOrWhitespace(string text)
+		{
+			if (string.IsNullOrEmpty(text))
+				return true;
+			string trimmed = text.Trim();
+			return trimmed.Length == 0;
+		}
 
 		/// <summary>
 		/// Returns the password as a series of *s