diff --git a/RombaSharp/RombaSharp.Help.cs b/RombaSharp/RombaSharp.Help.cs
index fff6994d..22be2707 100644
--- a/RombaSharp/RombaSharp.Help.cs
+++ b/RombaSharp/RombaSharp.Help.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Mono.Data.Sqlite;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;
+using Mono.Data.Sqlite;
 
 namespace RombaSharp
 {
diff --git a/RombaSharp/RombaSharp.Helpers.cs b/RombaSharp/RombaSharp.Helpers.cs
index 2772cbd7..b3f864c0 100644
--- a/RombaSharp/RombaSharp.Helpers.cs
+++ b/RombaSharp/RombaSharp.Helpers.cs
@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml;
-using Mono.Data.Sqlite;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
+using Mono.Data.Sqlite;
 
 namespace RombaSharp
 {
diff --git a/SabreTools.Library/DatFiles/OpenMSX.cs b/SabreTools.Library/DatFiles/OpenMSX.cs
index c0f3473c..1f18d277 100644
--- a/SabreTools.Library/DatFiles/OpenMSX.cs
+++ b/SabreTools.Library/DatFiles/OpenMSX.cs
@@ -629,14 +629,19 @@ namespace SabreTools.Library.DatFiles
                 xtw.WriteStartElement("softwaredb");
                 //xtw.WriteAttributeString("timestamp", timestamp);
 
-                // TODO: Figure out how to fix the issue with removed formatting after this point
-                //xtw.WriteComment("Credits");
-                //xtw.WriteCData(@"The softwaredb.xml file contains information about rom mapper types
+                //TODO: Figure out how to fix the issue with removed formatting after this point
+//                xtw.WriteComment("Credits");
+//                xtw.WriteCData(@"The softwaredb.xml file contains information about rom mapper types
 
-//Copyright 2003 Nicolas Beyaert (Initial Database)
-//Copyright 2004-2013 BlueMSX Team
-//Copyright 2005-2018 openMSX Team
-//Generation MSXIDs by www.generation-msx.nl");
+//-Copyright 2003 Nicolas Beyaert(Initial Database)
+//-Copyright 2004 - 2013 BlueMSX Team
+//-Copyright 2005 - 2020 openMSX Team
+//-Generation MSXIDs by www.generation - msx.nl
+
+//- Thanks go out to:
+//-Generation MSX / Sylvester for the incredible source of information
+//- p_gimeno and diedel for their help adding and valdiating ROM additions
+//- GDX for additional ROM info and validations and corrections");
 
                 xtw.Flush();
             }
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs
index 471067ad..f94c88bd 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.Library/DatFiles/SeparatedValue.cs
@@ -1,17 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
+
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 using SabreTools.Library.Tools;
-
-#if MONO
-using System.IO;
-#else
-using FileStream = System.IO.FileStream;
-using StreamReader = System.IO.StreamReader;
-using StreamWriter = System.IO.StreamWriter;
-#endif
 using NaturalSort;
 
 namespace SabreTools.Library.DatFiles
diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs
index ca43625c..065af240 100644
--- a/SabreTools.Library/DatItems/DatItem.cs
+++ b/SabreTools.Library/DatItems/DatItem.cs
@@ -7,7 +7,6 @@ using SabreTools.Library.Data;
 using SabreTools.Library.DatFiles;
 using SabreTools.Library.Tools;
 using NaturalSort;
-using System.Runtime.CompilerServices;
 
 namespace SabreTools.Library.DatItems
 {
diff --git a/SabreTools.Library/DatItems/Disk.cs b/SabreTools.Library/DatItems/Disk.cs
index 550587ef..ee95c759 100644
--- a/SabreTools.Library/DatItems/Disk.cs
+++ b/SabreTools.Library/DatItems/Disk.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+
 using SabreTools.Library.Data;
 using SabreTools.Library.FileTypes;
 using SabreTools.Library.Tools;
diff --git a/SabreTools.Library/DatItems/Machine.cs b/SabreTools.Library/DatItems/Machine.cs
index 7c427fc2..58a3d082 100644
--- a/SabreTools.Library/DatItems/Machine.cs
+++ b/SabreTools.Library/DatItems/Machine.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+
 using SabreTools.Library.Data;
 
 namespace SabreTools.Library.DatItems
diff --git a/SabreTools.Library/DatItems/Rom.cs b/SabreTools.Library/DatItems/Rom.cs
index cf20c1b0..7d9996fe 100644
--- a/SabreTools.Library/DatItems/Rom.cs
+++ b/SabreTools.Library/DatItems/Rom.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+
 using SabreTools.Library.Data;
 using SabreTools.Library.FileTypes;
 using SabreTools.Library.Tools;
diff --git a/SabreTools.Library/Data/Flags.cs b/SabreTools.Library/Data/Flags.cs
index d6e25fe7..af24b63c 100644
--- a/SabreTools.Library/Data/Flags.cs
+++ b/SabreTools.Library/Data/Flags.cs
@@ -274,7 +274,7 @@ namespace SabreTools.Library.Data
         SabreDat =              1 << 5,
 
         /// <summary>
-        /// OpenMSX Software List XML
+        /// openMSX Software List XML
         /// </summary>
         OpenMSX =               1 << 6,
 
diff --git a/SabreTools.Library/FileTypes/BaseArchive.cs b/SabreTools.Library/FileTypes/BaseArchive.cs
index 8ba4d0c3..ea472af5 100644
--- a/SabreTools.Library/FileTypes/BaseArchive.cs
+++ b/SabreTools.Library/FileTypes/BaseArchive.cs
@@ -1,15 +1,9 @@
 using System.Collections.Generic;
+using System.IO;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
-#if MONO
-using System.IO;
-#else
-using MemoryStream = System.IO.MemoryStream;
-using Stream = System.IO.Stream;
-#endif
-
 namespace SabreTools.Library.FileTypes
 {
     public abstract class BaseArchive : Folder
diff --git a/SabreTools.Library/FileTypes/BaseFile.cs b/SabreTools.Library/FileTypes/BaseFile.cs
index bcd83ba2..a91a92b6 100644
--- a/SabreTools.Library/FileTypes/BaseFile.cs
+++ b/SabreTools.Library/FileTypes/BaseFile.cs
@@ -1,11 +1,7 @@
-using SabreTools.Library.Data;
-using SabreTools.Library.Tools;
+using System.IO;
 
-#if MONO
-using System.IO;
-#else
-using Stream = System.IO.Stream;
-#endif
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 namespace SabreTools.Library.FileTypes
 {
diff --git a/SabreTools.Library/FileTypes/CHDFile.cs b/SabreTools.Library/FileTypes/CHDFile.cs
index 7f38515c..35f4ed29 100644
--- a/SabreTools.Library/FileTypes/CHDFile.cs
+++ b/SabreTools.Library/FileTypes/CHDFile.cs
@@ -1,13 +1,7 @@
-using SabreTools.Library.Data;
-using SabreTools.Library.Tools;
+using System.IO;
 
-#if MONO
-using System.IO;
-#else
-using BinaryReader = System.IO.BinaryReader;
-using SeekOrigin = System.IO.SeekOrigin;
-using Stream = System.IO.Stream;
-#endif
+using SabreTools.Library.Data;
+using SabreTools.Library.Tools;
 
 namespace SabreTools.Library.FileTypes
 {
diff --git a/SabreTools.Library/FileTypes/CoreRarArchive.cs b/SabreTools.Library/FileTypes/CoreRarArchive.cs
index 47ccbb2e..98538d1b 100644
--- a/SabreTools.Library/FileTypes/CoreRarArchive.cs
+++ b/SabreTools.Library/FileTypes/CoreRarArchive.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
diff --git a/SabreTools.Library/FileTypes/LRZipArchive.cs b/SabreTools.Library/FileTypes/LRZipArchive.cs
index 7a611f55..ef4a77a7 100644
--- a/SabreTools.Library/FileTypes/LRZipArchive.cs
+++ b/SabreTools.Library/FileTypes/LRZipArchive.cs
@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
-#if MONO
-using System.IO;
-#else
-using MemoryStream = System.IO.MemoryStream;
-using Stream = System.IO.Stream;
-#endif
-
 namespace SabreTools.Library.FileTypes
 {
     /// <summary>
diff --git a/SabreTools.Library/FileTypes/LZ4Archive.cs b/SabreTools.Library/FileTypes/LZ4Archive.cs
index c7949581..f98c01f4 100644
--- a/SabreTools.Library/FileTypes/LZ4Archive.cs
+++ b/SabreTools.Library/FileTypes/LZ4Archive.cs
@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
-#if MONO
-using System.IO;
-#else
-using MemoryStream = System.IO.MemoryStream;
-using Stream = System.IO.Stream;
-#endif
-
 namespace SabreTools.Library.FileTypes
 {
     /// <summary>
diff --git a/SabreTools.Library/FileTypes/ZPAQArchive.cs b/SabreTools.Library/FileTypes/ZPAQArchive.cs
index 03d72ace..e3f6a0be 100644
--- a/SabreTools.Library/FileTypes/ZPAQArchive.cs
+++ b/SabreTools.Library/FileTypes/ZPAQArchive.cs
@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
-#if MONO
-using System.IO;
-#else
-using MemoryStream = System.IO.MemoryStream;
-using Stream = System.IO.Stream;
-#endif
-
 namespace SabreTools.Library.FileTypes
 {
     /// <summary>
diff --git a/SabreTools.Library/FileTypes/ZstdArchive.cs b/SabreTools.Library/FileTypes/ZstdArchive.cs
index d72a9d31..fb161cf3 100644
--- a/SabreTools.Library/FileTypes/ZstdArchive.cs
+++ b/SabreTools.Library/FileTypes/ZstdArchive.cs
@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.DatItems;
 
-#if MONO
-using System.IO;
-#else
-using MemoryStream = System.IO.MemoryStream;
-using Stream = System.IO.Stream;
-#endif
-
 namespace SabreTools.Library.FileTypes
 {
     /// <summary>
diff --git a/SabreTools.Library/Help/Feature.cs b/SabreTools.Library/Help/Feature.cs
index 4ed87367..6b15d939 100644
--- a/SabreTools.Library/Help/Feature.cs
+++ b/SabreTools.Library/Help/Feature.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+
 using SabreTools.Library.Data;
 
 namespace SabreTools.Library.Help
diff --git a/SabreTools.Library/Tools/Hasher.cs b/SabreTools.Library/Tools/Hasher.cs
index 646cc80d..d780946d 100644
--- a/SabreTools.Library/Tools/Hasher.cs
+++ b/SabreTools.Library/Tools/Hasher.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 
 using SabreTools.Library.Data;
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index a1a1ec29..eeafed72 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Xml;
 using SabreTools.Library.Data;
 using SabreTools.Library.Help;
 using SabreTools.Library.Tools;