diff --git a/SabreTools.Serialization/Models/StarForce/Constants.cs b/SabreTools.Serialization/Models/StarForce/Constants.cs
index cc9d8092..ff37e74b 100644
--- a/SabreTools.Serialization/Models/StarForce/Constants.cs
+++ b/SabreTools.Serialization/Models/StarForce/Constants.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.StarForce
 
         public const uint SignatureUInt32 = 0x53464653;
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/StarForce/FileHeader.cs b/SabreTools.Serialization/Models/StarForce/FileHeader.cs
index 4b74da05..a4400a10 100644
--- a/SabreTools.Serialization/Models/StarForce/FileHeader.cs
+++ b/SabreTools.Serialization/Models/StarForce/FileHeader.cs
@@ -12,6 +12,6 @@
         /// File info (timestamps, size, data position, encrypted)
         /// </summary>
         /// <remarks>Unknown format</remarks>
-        public byte[]FileInfo { get; set; }
+        public byte[] FileInfo { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/StarForce/FileSystem.cs b/SabreTools.Serialization/Models/StarForce/FileSystem.cs
index de0cc875..bd7dcf66 100644
--- a/SabreTools.Serialization/Models/StarForce/FileSystem.cs
+++ b/SabreTools.Serialization/Models/StarForce/FileSystem.cs
@@ -18,16 +18,16 @@
         /// <summary>
         /// Header
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; }
 
         /// <summary>
         /// Files
         /// </summary>
-        public FileEntry[]? Files { get; set; }
+        public FileEntry[] Files { get; set; }
 
         /// <summary>
         /// File headers
         /// </summary>
-        public FileHeader[]? FileHeaders { get; set; }
+        public FileHeader[] FileHeaders { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Wrappers/SFFS.Printing.cs b/SabreTools.Serialization/Wrappers/SFFS.Printing.cs
index 7d8cd7a9..5faef9a9 100644
--- a/SabreTools.Serialization/Wrappers/SFFS.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/SFFS.Printing.cs
@@ -13,41 +13,31 @@ namespace SabreTools.Serialization.Wrappers
 
         /// <inheritdoc/>
         public void PrintInformation(StringBuilder builder)
-            => Print(builder, Model);
-
-        private static void Print(StringBuilder builder, FileSystem fs)
         {
             builder.AppendLine("StarForce File System Information:");
             builder.AppendLine("-------------------------");
             builder.AppendLine();
 
-            Print(builder, fs.Header);
-            Print(builder, fs.Files);
-            Print(builder, fs.FileHeaders);
+            Print(builder, Model.Header);
+            Print(builder, Model.Files);
+            Print(builder, Model.FileHeaders);
         }
 
-        private static void Print(StringBuilder builder, Header? header)
+        private static void Print(StringBuilder builder, Header header)
         {
             builder.AppendLine("  Header Information:");
             builder.AppendLine("  -------------------------");
-            if (header == null)
-            {
-                builder.AppendLine("  No header");
-                builder.AppendLine();
-                return;
-            }
-
             builder.AppendLine(header.Magic, "  Magic");
             builder.AppendLine(header.Version, "  Version");
             builder.AppendLine(header.FileCount, "  FileCount");
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, FileEntry[]? entries)
+        private static void Print(StringBuilder builder, FileEntry[] entries)
         {
             builder.AppendLine("  File Entries Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No file entries");
                 builder.AppendLine();
@@ -66,11 +56,11 @@ namespace SabreTools.Serialization.Wrappers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, FileHeader[]? entries)
+        private static void Print(StringBuilder builder, FileHeader[] entries)
         {
             builder.AppendLine("  File Headers Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No file headers");
                 builder.AppendLine();