diff --git a/SabreTools.Serialization/Models/PlayStation3/Constants.cs b/SabreTools.Serialization/Models/PlayStation3/Constants.cs
index 0bde2937..234af5a6 100644
--- a/SabreTools.Serialization/Models/PlayStation3/Constants.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/Constants.cs
@@ -1,19 +1,19 @@
 // TODO: Add more constants from the wiki
 namespace SabreTools.Data.Models.PlayStation3
 {
-    /// <see href="https://psdevwiki.com/ps3/PS3_DISC.SFB"/> 
+    /// <see href="https://psdevwiki.com/ps3/PS3_DISC.SFB"/>
     public static class Constants
     {
         /// <summary>
         /// Identifying bytes for SFO file
         /// </summary>
         public const uint SFOMagic = 0x00505346;
-        
+
         /// <summary>
         /// Identifying bytes for SFB file
         /// </summary>
         public const uint SFBMagic = 0x2E534642;
-        
+
         #region Hybrid Flags
 
         /// <summary>
@@ -64,4 +64,4 @@ namespace SabreTools.Data.Models.PlayStation3
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/PlayStation3/Enums.cs b/SabreTools.Serialization/Models/PlayStation3/Enums.cs
index ff5e56d5..9d14cca5 100644
--- a/SabreTools.Serialization/Models/PlayStation3/Enums.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/Enums.cs
@@ -1,7 +1,7 @@
 // TODO: Add more enumerations from the wiki
 namespace SabreTools.Data.Models.PlayStation3
 {
-    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/> 
+    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/>
     public enum DataFormat : ushort
     {
         /// <summary>
@@ -28,4 +28,4 @@ namespace SabreTools.Data.Models.PlayStation3
         /// </remarks>
         Integer = 0x0404,
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/PlayStation3/SFB.cs b/SabreTools.Serialization/Models/PlayStation3/SFB.cs
index 9b628766..65062b31 100644
--- a/SabreTools.Serialization/Models/PlayStation3/SFB.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/SFB.cs
@@ -28,7 +28,7 @@ namespace SabreTools.Data.Models.PlayStation3
         /// </summary>
         /// <remarks>0x10 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x10)]
-        public string? FlagsType;
+        public string FlagsType;
 
         /// <summary>
         /// Disc Content Data Offset
@@ -52,7 +52,7 @@ namespace SabreTools.Data.Models.PlayStation3
         /// </summary>
         /// <remarks>0x08 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x08)]
-        public string? DiscTitleName;
+        public string DiscTitleName;
 
         /// <summary>
         /// Unknown (zeroes)
@@ -83,21 +83,21 @@ namespace SabreTools.Data.Models.PlayStation3
         /// </summary>
         /// <remarks>0x20 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
-        public string? DiscContent;
+        public string DiscContent;
 
         /// <summary>
         /// Disc Title
         /// </summary>
         /// <remarks>0x10 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x10)]
-        public string? DiscTitle;
+        public string DiscTitle;
 
         /// <summary>
         /// Disc Version
         /// </summary>
         /// <remarks>0x10 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x10)]
-        public string? DiscVersion;
+        public string DiscVersion;
 
         /// <summary>
         /// Unknown (zeroes)
diff --git a/SabreTools.Serialization/Models/PlayStation3/SFO.cs b/SabreTools.Serialization/Models/PlayStation3/SFO.cs
index 73a1a262..13bfb131 100644
--- a/SabreTools.Serialization/Models/PlayStation3/SFO.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/SFO.cs
@@ -6,12 +6,12 @@ namespace SabreTools.Data.Models.PlayStation3
         /// <summary>
         /// SFO header
         /// </summary>
-        public SFOHeader? Header { get; set; }
+        public SFOHeader Header { get; set; }
 
         /// <summary>
         /// Index table
         /// </summary>
-        public SFOIndexTableEntry[]? IndexTable { get; set; }
+        public SFOIndexTableEntry[] IndexTable { get; set; }
 
         /// <summary>
         /// Key table
@@ -29,7 +29,7 @@ namespace SabreTools.Data.Models.PlayStation3
         /// coincidence caused by the length of the key names used, when this
         /// happens there is no padding needed)
         /// </remarks>
-        public string[]? KeyTable { get; set; }
+        public string[] KeyTable { get; set; }
 
         /// <summary>
         /// Padding
@@ -50,6 +50,6 @@ namespace SabreTools.Data.Models.PlayStation3
         /// being used). This entries can be considered reserved, and are marked with
         /// a len = 0 in the associated entry in the index_table
         /// </remarks>
-        public byte[][]? DataTable { get; set; }
+        public byte[][] DataTable { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/PlayStation3/SFOHeader.cs b/SabreTools.Serialization/Models/PlayStation3/SFOHeader.cs
index fe8e9b34..3841c7d8 100644
--- a/SabreTools.Serialization/Models/PlayStation3/SFOHeader.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/SFOHeader.cs
@@ -2,7 +2,7 @@ using System.Runtime.InteropServices;
 
 namespace SabreTools.Data.Models.PlayStation3
 {
-    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/> 
+    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/>
     [StructLayout(LayoutKind.Sequential)]
     public class SFOHeader
     {
diff --git a/SabreTools.Serialization/Models/PlayStation3/SFOIndexTableEntry.cs b/SabreTools.Serialization/Models/PlayStation3/SFOIndexTableEntry.cs
index 5f54e55f..f39d15a8 100644
--- a/SabreTools.Serialization/Models/PlayStation3/SFOIndexTableEntry.cs
+++ b/SabreTools.Serialization/Models/PlayStation3/SFOIndexTableEntry.cs
@@ -2,7 +2,7 @@ using System.Runtime.InteropServices;
 
 namespace SabreTools.Data.Models.PlayStation3
 {
-    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/> 
+    /// <see href="https://psdevwiki.com/ps3/PARAM.SFO"/>
     [StructLayout(LayoutKind.Sequential)]
     public class SFOIndexTableEntry
     {
@@ -16,12 +16,12 @@ namespace SabreTools.Data.Models.PlayStation3
         /// Data type
         /// </summary>
         [MarshalAs(UnmanagedType.U2)]
-        public DataFormat DataFormat; 
+        public DataFormat DataFormat;
 
         /// <summary>
         /// Data used length
         /// </summary>
-        public uint DataLength; 
+        public uint DataLength;
 
         /// <summary>
         /// Data total length. TITLE_ID is always = 16 bytes