diff --git a/RombaSharp/RombaSharp.Inits.cs b/RombaSharp/RombaSharp.Inits.cs
index f3da041a..88f4b1bf 100644
--- a/RombaSharp/RombaSharp.Inits.cs
+++ b/RombaSharp/RombaSharp.Inits.cs
@@ -301,7 +301,7 @@ namespace RombaSharp
 				if (input.Length == Constants.CRCLength)
 				{
 					temp = Utilities.CleanHashData(input, Constants.CRCLength);
-					if (temp != "")
+					if (!String.IsNullOrWhiteSpace(temp))
 					{
 						crc.Add(temp);
 					}
@@ -309,7 +309,7 @@ namespace RombaSharp
 				else if (input.Length == Constants.MD5Length)
 				{
 					temp = Utilities.CleanHashData(input, Constants.MD5Length);
-					if (temp != "")
+					if (!String.IsNullOrWhiteSpace(temp))
 					{
 						md5.Add(temp);
 					}
@@ -317,7 +317,7 @@ namespace RombaSharp
 				else if (input.Length == Constants.SHA1Length)
 				{
 					temp = Utilities.CleanHashData(input, Constants.SHA1Length);
-					if (temp != "")
+					if (!String.IsNullOrWhiteSpace(temp))
 					{
 						sha1.Add(temp);
 					}
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index c97998dd..4267af7a 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -2196,7 +2196,7 @@ namespace SabreTools.Library.DatFiles
 						string filename = inputs[newItem.SystemID].Split('¬')[0];
 						string rootpath = inputs[newItem.SystemID].Split('¬')[1];
 
-						rootpath += (rootpath == "" ? "" : Path.DirectorySeparatorChar.ToString());
+						rootpath += (String.IsNullOrWhiteSpace(rootpath) ? "" : Path.DirectorySeparatorChar.ToString());
 						filename = filename.Remove(0, rootpath.Length);
 						newItem.MachineName = Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
 							+ Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar
@@ -3584,7 +3584,7 @@ namespace SabreTools.Library.DatFiles
 				string romname = "";
 
 				// If the parent is blank, then we have a non-archive file
-				if (parent == "")
+				if (String.IsNullOrWhiteSpace(parent))
 				{
 					// If we have a SuperDAT, we want anything that's not the base path as the game, and the file as the rom
 					if (Type == "SuperDAT")
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs
index 4c662cd1..77ee76ed 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.Library/DatFiles/Logiqx.cs
@@ -570,7 +570,7 @@ namespace SabreTools.Library.DatFiles
 							if (superdat && !keep)
 							{
 								string tempout = Regex.Match(machine.Name, @".*?\\(.*)").Groups[1].Value;
-								if (tempout != "")
+								if (!String.IsNullOrWhiteSpace(tempout))
 								{
 									machine.Name = tempout;
 								}
@@ -994,11 +994,11 @@ namespace SabreTools.Library.DatFiles
 							superdat = true;
 							if (keep)
 							{
-								Type = (Type == "" ? "SuperDAT" : Type);
+								Type = (String.IsNullOrWhiteSpace(Type) ? "SuperDAT" : Type);
 							}
 
 							string foldername = (xtr.GetAttribute("name") ?? "");
-							if (foldername != "")
+							if (!String.IsNullOrWhiteSpace(foldername))
 							{
 								parent.Add(foldername);
 							}
@@ -1099,7 +1099,7 @@ namespace SabreTools.Library.DatFiles
 							if (!keep || !superdat)
 							{
 								string tempout = Regex.Match(dir.Name, @".*?\\(.*)").Groups[1].Value;
-								if (tempout != "")
+								if (!String.IsNullOrWhiteSpace(tempout))
 								{
 									dir.Name = tempout;
 								}
diff --git a/SabreTools.Library/DatFiles/Missfile.cs b/SabreTools.Library/DatFiles/Missfile.cs
index 9a2ac902..dbcf6062 100644
--- a/SabreTools.Library/DatFiles/Missfile.cs
+++ b/SabreTools.Library/DatFiles/Missfile.cs
@@ -240,7 +240,7 @@ namespace SabreTools.Library.DatFiles
 					if (rom.Type == ItemType.Rom)
 					{
 						// We can only write out if there's a SHA-1
-						if (((Rom)rom).SHA1 != "")
+						if (!String.IsNullOrWhiteSpace(((Rom)rom).SHA1))
 						{
 							name = ((Rom)rom).SHA1.Substring(0, 2)
 								+ "/" + ((Rom)rom).SHA1.Substring(2, 2)
@@ -253,7 +253,7 @@ namespace SabreTools.Library.DatFiles
 					else if (rom.Type == ItemType.Disk)
 					{
 						// We can only write out if there's a SHA-1
-						if (((Disk)rom).SHA1 != "")
+						if (!String.IsNullOrWhiteSpace(((Disk)rom).SHA1))
 						{
 							name = ((Disk)rom).SHA1.Substring(0, 2)
 								+ "/" + ((Disk)rom).SHA1.Substring(2, 2)
@@ -269,7 +269,7 @@ namespace SabreTools.Library.DatFiles
 				else
 				{
 					name = (UseGame ? rom.MachineName : rom.Name);
-					if (ReplaceExtension != "" || RemoveExtension)
+					if (!String.IsNullOrWhiteSpace(ReplaceExtension) || RemoveExtension)
 					{
 						if (RemoveExtension)
 						{
@@ -280,7 +280,7 @@ namespace SabreTools.Library.DatFiles
 						dir = (dir.StartsWith(Path.DirectorySeparatorChar.ToString()) ? dir.Remove(0, 1) : dir);
 						name = Path.Combine(dir, Path.GetFileNameWithoutExtension(name) + ReplaceExtension);
 					}
-					if (AddExtension != "")
+					if (!String.IsNullOrWhiteSpace(AddExtension))
 					{
 						name += AddExtension;
 					}
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs
index 18bb7ac7..5645b8fb 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.Library/DatFiles/SeparatedValue.cs
@@ -208,7 +208,7 @@ namespace SabreTools.Library.DatFiles
 							break;
 						case "Rom.Name":
 						case "Disk.Name":
-							name = value == "" ? name : value;
+							name = String.IsNullOrWhiteSpace(value) ? name : value;
 							break;
 						case "DatItem.Size":
 							if (!Int64.TryParse(value, out size))
diff --git a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
index 6ced286e..447783dd 100644
--- a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
+++ b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs
@@ -42,13 +42,13 @@ namespace NaturalSort
 			if (!table.TryGetValue(x, out string[] x1))
 			{
 				//x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)");
-				x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
+				x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !String.IsNullOrWhiteSpace(s)).ToArray();
 				table.Add(x, x1);
 			}
 			if (!table.TryGetValue(y, out string[] y1))
 			{
 				//y1 = Regex.Split(y.Replace(" ", ""), "([0-9]+)");
-				y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
+				y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !String.IsNullOrWhiteSpace(s)).ToArray();
 				table.Add(y, y1);
 			}
 
diff --git a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
index fcaab4dd..3c640791 100644
--- a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
+++ b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs
@@ -42,13 +42,13 @@ namespace NaturalSort
 			if (!table.TryGetValue(x, out string[] x1))
 			{
 				//x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)");
-				x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
+				x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !String.IsNullOrWhiteSpace(s)).ToArray();
 				table.Add(x, x1);
 			}
 			if (!table.TryGetValue(y, out string[] y1))
 			{
 				//y1 = Regex.Split(y.Replace(" ", ""), "([0-9]+)");
-				y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
+				y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !String.IsNullOrWhiteSpace(s)).ToArray();
 				table.Add(y, y1);
 			}
 
diff --git a/SabreTools.Library/Tools/Utilities.cs b/SabreTools.Library/Tools/Utilities.cs
index f9d5bfba..d4b425f5 100644
--- a/SabreTools.Library/Tools/Utilities.cs
+++ b/SabreTools.Library/Tools/Utilities.cs
@@ -1333,7 +1333,7 @@ namespace SabreTools.Library.Tools
 		public static bool DetectSkipperAndTransform(string file, string outDir, bool nostore)
 		{
 			// Create the output directory if it doesn't exist
-			if (outDir != "" && !Directory.Exists(outDir))
+			if (!String.IsNullOrWhiteSpace(outDir) && !Directory.Exists(outDir))
 			{
 				Directory.CreateDirectory(outDir);
 			}
@@ -1361,7 +1361,7 @@ namespace SabreTools.Library.Tools
 			br.Dispose();
 
 			// Apply the rule to the file
-			string newfile = (outDir == "" ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file)));
+			string newfile = (String.IsNullOrWhiteSpace(outDir) ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file)));
 			rule.TransformFile(file, newfile);
 
 			// If the output file doesn't exist, return false
@@ -1467,7 +1467,7 @@ namespace SabreTools.Library.Tools
 		public static bool RestoreHeader(string file, string outDir)
 		{
 			// Create the output directory if it doesn't exist
-			if (outDir != "" && !Directory.Exists(outDir))
+			if (!String.IsNullOrWhiteSpace(outDir) && !Directory.Exists(outDir))
 			{
 				Directory.CreateDirectory(outDir);
 			}
@@ -1488,9 +1488,9 @@ namespace SabreTools.Library.Tools
 			for (int i = 0; i < headers.Count; i++)
 			{
 				Globals.Logger.User("Creating reheadered file: " +
-						(outDir == "" ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file))) + i);
+						(String.IsNullOrWhiteSpace(outDir) ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file))) + i);
 				AppendBytesToFile(file,
-					(outDir == "" ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file))) + i, headers[i], string.Empty);
+					(String.IsNullOrWhiteSpace(outDir) ? Path.GetFullPath(file) + ".new" : Path.Combine(outDir, Path.GetFileName(file))) + i, headers[i], string.Empty);
 				Globals.Logger.User("Reheadered file created!");
 			}
 
diff --git a/SabreTools/SabreTools.Inits.cs b/SabreTools/SabreTools.Inits.cs
index 545d067b..838de6e6 100644
--- a/SabreTools/SabreTools.Inits.cs
+++ b/SabreTools/SabreTools.Inits.cs
@@ -259,10 +259,10 @@ namespace SabreTools
 			bool updateHashes)
 		{
 			// Normalize the extensions
-			datHeader.AddExtension = (datHeader.AddExtension == "" || datHeader.AddExtension.StartsWith(".")
+			datHeader.AddExtension = (String.IsNullOrWhiteSpace(datHeader.AddExtension) || datHeader.AddExtension.StartsWith(".")
 				? datHeader.AddExtension
 				: "." + datHeader.AddExtension);
-			datHeader.ReplaceExtension = (datHeader.ReplaceExtension == "" || datHeader.ReplaceExtension.StartsWith(".")
+			datHeader.ReplaceExtension = (String.IsNullOrWhiteSpace(datHeader.ReplaceExtension) || datHeader.ReplaceExtension.StartsWith(".")
 				? datHeader.ReplaceExtension
 				: "." + datHeader.ReplaceExtension);
 
@@ -270,17 +270,17 @@ namespace SabreTools
 			if (updateMode != 0)
 			{
 				// Get the values that will be used
-				if (datHeader.Date == "")
+				if (String.IsNullOrWhiteSpace(datHeader.Date))
 				{
 					datHeader.Date = DateTime.Now.ToString("yyyy-MM-dd");
 				}
-				if (datHeader.Name == "")
+				if (String.IsNullOrWhiteSpace(datHeader.Name))
 				{
 					datHeader.Name = (updateMode != 0 ? "DiffDAT" : "MergeDAT")
 						+ (datHeader.Type == "SuperDAT" ? "-SuperDAT" : "")
 						+ (datHeader.DedupeRoms != DedupeType.None ? "-deduped" : "");
 				}
-				if (datHeader.Description == "")
+				if (String.IsNullOrWhiteSpace(datHeader.Description))
 				{
 					datHeader.Description = (updateMode != 0 ? "DiffDAT" : "MergeDAT")
 						+ (datHeader.Type == "SuperDAT" ? "-SuperDAT" : "")
@@ -290,11 +290,11 @@ namespace SabreTools
 						datHeader.Description += " (" + datHeader.Date + ")";
 					}
 				}
-				if (datHeader.Category == "" && updateMode != 0)
+				if (String.IsNullOrWhiteSpace(datHeader.Category) && updateMode != 0)
 				{
 					datHeader.Category = "DiffDAT";
 				}
-				if (datHeader.Author == "")
+				if (String.IsNullOrWhiteSpace(datHeader.Author))
 				{
 					datHeader.Author = "SabreTools";
 				}