diff --git a/SabreTools.Helper/Dats/Archive.cs b/SabreTools.Helper/Dats/Archive.cs
index dc4e88d3..3dd887fd 100644
--- a/SabreTools.Helper/Dats/Archive.cs
+++ b/SabreTools.Helper/Dats/Archive.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/BiosSet.cs b/SabreTools.Helper/Dats/BiosSet.cs
index 3a84f6ea..453fdc4c 100644
--- a/SabreTools.Helper/Dats/BiosSet.cs
+++ b/SabreTools.Helper/Dats/BiosSet.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
index f5d3a919..38ac5a60 100644
--- a/SabreTools.Helper/Dats/DatFile.cs
+++ b/SabreTools.Helper/Dats/DatFile.cs
@@ -7,8 +7,10 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web;
 using System.Xml;
+
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
+
 using NaturalSort;
 using SharpCompress.Common;
 
diff --git a/SabreTools.Helper/Dats/DatItem.cs b/SabreTools.Helper/Dats/DatItem.cs
index 4e415397..d1f8ca85 100644
--- a/SabreTools.Helper/Dats/DatItem.cs
+++ b/SabreTools.Helper/Dats/DatItem.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
+
 using NaturalSort;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/DatItemKV.cs b/SabreTools.Helper/Dats/DatItemKV.cs
deleted file mode 100644
index 658e908c..00000000
--- a/SabreTools.Helper/Dats/DatItemKV.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Linq;
-
-namespace SabreTools.Helper.Dats
-{
-	public class DatItemKV : IEquatable<DatItemKV>
-	{
-		// Private instance variables
-		private string _name;
-		private NameValueCollection _attributes;
-		private NameValueCollection _machineAttributes;
-		private NameValueCollection _machineElements;
-
-		// Public instance variables
-		public string Name
-		{
-			get { return _name; }
-			set { _name = value; }
-		}
-		public string Type
-		{
-			get { return _name; }
-			set { _name = value; }
-		}
-		public string[] this[string s]
-		{
-			get
-			{
-				if (_attributes == null)
-				{
-					_attributes = new NameValueCollection();
-				}
-
-				return _attributes.GetValues(s);
-			}
-		}
-
-		// Constructors
-		public DatItemKV(string name)
-		{
-			_name = name;
-			_attributes = new NameValueCollection();
-			_machineAttributes = new NameValueCollection();
-			_machineElements = new NameValueCollection();
-		}
-
-		// Comparison methods
-		public bool Equals(DatItemKV other)
-		{
-			// If the types don't match, then it's not the same
-			if (_name != other.Type)
-			{
-				return false;
-			}
-
-			// Otherwise, loop through and compare against what you can
-			bool success = true;
-			foreach (string key in _attributes.Keys)
-			{
-				string[] vals = _attributes.GetValues(key);
-				string[] ovals = other.GetValues(key);
-
-				// Special case for "rom"
-				if (_name == "rom")
-				{
-					// If either is a nodump, it's never a match
-					if (Get("status") == "nodump" || other.Get("status") == "nodump")
-					{
-						success = false;
-					}
-
-					// If the size is the same and any combination of metadata matches
-					if ((Get("size") == other.Get("size")) &&
-						((String.IsNullOrEmpty(Get("crc")) || String.IsNullOrEmpty(other.Get("crc"))) || Get("crc") == other.Get("crc")) &&
-						((String.IsNullOrEmpty(Get("md5")) || String.IsNullOrEmpty(other.Get("md5"))) || Get("md5") == other.Get("md5")) &&
-						((String.IsNullOrEmpty(Get("sha1")) || String.IsNullOrEmpty(other.Get("sha1"))) || Get("sha1") == other.Get("sha1")))
-					{
-						success = true;
-					}
-					else
-					{
-						success = false;
-					}
-				}
-				// Special case for "disk"
-				else if (_name == "disk")
-				{
-					// If either is a nodump, it's never a match
-					if (Get("status") == "nodump" || other.Get("status") == "nodump")
-					{
-						success = false;
-					}
-
-					// If any combination of metadata matches
-					if (((String.IsNullOrEmpty(Get("md5")) || String.IsNullOrEmpty(other.Get("md5"))) || Get("md5") == other.Get("md5")) &&
-						((String.IsNullOrEmpty(Get("sha1")) || String.IsNullOrEmpty(other.Get("sha1"))) || Get("sha1") == other.Get("sha1")))
-					{
-						success = true;
-					}
-					else
-					{
-						success = false;
-					}
-				}
-				// For everything else
-				else
-				{
-					// http://stackoverflow.com/questions/649444/testing-equality-of-arrays-in-c-sharp
-					var q = from a in vals
-							join b in ovals on a equals b
-							select a;
-
-					success &= vals.Length == ovals.Length && q.Count() == vals.Length;
-				}
-			}
-
-			return success;
-		}
-
-		// Instance methods
-		public void Add(string name, string value)
-		{
-			_attributes.Add(name, value);
-		}
-		public string Get(string name)
-		{
-			return _attributes.Get(name);
-		}
-		public string Get(int index)
-		{
-			return _attributes.Get(index);
-		}
-		public string[] GetValues(string name)
-		{
-			return _attributes.GetValues(name);
-		}
-		public string[] GetValues(int index)
-		{
-			return _attributes.GetValues(index);
-		}
-
-		public void MachineAttributesAdd(string name, string value)
-		{
-			_machineAttributes.Add(name, value);
-		}
-		public string MachineAttributesGet(string name)
-		{
-			return _attributes.Get(name);
-		}
-		public string MachineAttributesGet(int index)
-		{
-			return _attributes.Get(index);
-		}
-		public string[] MachineAttributesGetValues(string name)
-		{
-			return _attributes.GetValues(name);
-		}
-		public string[] MachineAttributesGetValues(int index)
-		{
-			return _attributes.GetValues(index);
-		}
-
-		public void MachineElementsAdd(string name, string value)
-		{
-			_machineAttributes.Add(name, value);
-		}
-		public string MachineElementsGet(string name)
-		{
-			return _attributes.Get(name);
-		}
-		public string MachineElementsGet(int index)
-		{
-			return _attributes.Get(index);
-		}
-		public string[] MachineElementsGetValues(string name)
-		{
-			return _attributes.GetValues(name);
-		}
-		public string[] MachineElementsGetValues(int index)
-		{
-			return _attributes.GetValues(index);
-		}
-	}
-}
diff --git a/SabreTools.Helper/Dats/Disk.cs b/SabreTools.Helper/Dats/Disk.cs
index 10bf437c..b6e6577b 100644
--- a/SabreTools.Helper/Dats/Disk.cs
+++ b/SabreTools.Helper/Dats/Disk.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/Release.cs b/SabreTools.Helper/Dats/Release.cs
index 19b2c343..6259e803 100644
--- a/SabreTools.Helper/Dats/Release.cs
+++ b/SabreTools.Helper/Dats/Release.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/Rom.cs b/SabreTools.Helper/Dats/Rom.cs
index 6d503a7a..02fdc07a 100644
--- a/SabreTools.Helper/Dats/Rom.cs
+++ b/SabreTools.Helper/Dats/Rom.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/Dats/Sample.cs b/SabreTools.Helper/Dats/Sample.cs
index c96e9fdf..1a771712 100644
--- a/SabreTools.Helper/Dats/Sample.cs
+++ b/SabreTools.Helper/Dats/Sample.cs
@@ -1,4 +1,5 @@
 using System;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Dats
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index 7e5d3a51..59ce4ab3 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -106,7 +106,6 @@
     <Compile Include="Dats\BiosSet.cs" />
     <Compile Include="Dats\DatFile.cs" />
     <Compile Include="Dats\DatItem.cs" />
-    <Compile Include="Dats\DatItemKV.cs" />
     <Compile Include="Dats\Disk.cs" />
     <Compile Include="Dats\Machine.cs" />
     <Compile Include="Dats\Release.cs" />
diff --git a/SabreTools.Helper/Skippers/Skipper.cs b/SabreTools.Helper/Skippers/Skipper.cs
index 7259d56f..7c6572ac 100644
--- a/SabreTools.Helper/Skippers/Skipper.cs
+++ b/SabreTools.Helper/Skippers/Skipper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Xml;
+
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
 
diff --git a/SabreTools.Helper/Skippers/SkipperRule.cs b/SabreTools.Helper/Skippers/SkipperRule.cs
index 004e0b22..6b7b0ae8 100644
--- a/SabreTools.Helper/Skippers/SkipperRule.cs
+++ b/SabreTools.Helper/Skippers/SkipperRule.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using SabreTools.Helper.Data;
 
 namespace SabreTools.Helper.Skippers
diff --git a/SabreTools.Helper/Tools/DatabaseTools.cs b/SabreTools.Helper/Tools/DatabaseTools.cs
index 0cabd170..115d260c 100644
--- a/SabreTools.Helper/Tools/DatabaseTools.cs
+++ b/SabreTools.Helper/Tools/DatabaseTools.cs
@@ -1,7 +1,8 @@
-using System;
+using Mono.Data.Sqlite;
+using System;
 using System.IO;
+
 using SabreTools.Helper.Data;
-using Mono.Data.Sqlite;
 
 namespace SabreTools.Helper.Tools
 {
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index 60e68bbd..c7be5586 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -1,4 +1,5 @@
-using System;
+using Mono.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -6,10 +7,11 @@ using System.Security.Cryptography;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Schema;
+
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Skippers;
-using Mono.Data.Sqlite;
+
 using NaturalSort;
 using OCRC;
 
diff --git a/SabreTools.Helper/Tools/Style.cs b/SabreTools.Helper/Tools/Style.cs
index 631053d3..81b792d1 100644
--- a/SabreTools.Helper/Tools/Style.cs
+++ b/SabreTools.Helper/Tools/Style.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
+
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 
diff --git a/SimpleSort/SimpleSort.cs b/SimpleSort/SimpleSort.cs
index 19a021ba..be4a1d58 100644
--- a/SimpleSort/SimpleSort.cs
+++ b/SimpleSort/SimpleSort.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using SabreTools.Helper;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;