diff --git a/BurnOutSharp.Wrappers/PortableExecutable.cs b/BurnOutSharp.Wrappers/PortableExecutable.cs
index 29eecc20..7f4e2ca5 100644
--- a/BurnOutSharp.Wrappers/PortableExecutable.cs
+++ b/BurnOutSharp.Wrappers/PortableExecutable.cs
@@ -2603,43 +2603,27 @@ namespace BurnOutSharp.Wrappers
         {
             string padding = new string(' ', (level + 1) * 2);
 
+            // Print the type first
             if (resourceType is uint numericType)
-            {
                 Console.WriteLine($"{padding}Type {(Models.PortableExecutable.ResourceType)numericType} found, not parsed yet");
-
-                //if (entry.Data != null)
-                //    Console.WriteLine($"{padding}Value (ASCII): {Encoding.ASCII.GetString(entry.Data)}");
-                //if (entry.Data != null)
-                //    Console.WriteLine($"{padding}Value (UTF-8): {Encoding.UTF8.GetString(entry.Data)}");
-                //if (entry.Data != null)
-                //    Console.WriteLine($"{padding}Value (Unicode): {Encoding.Unicode.GetString(entry.Data)}");
-            }
             else if (resourceType is string stringType)
-            {
                 Console.WriteLine($"{padding}Type {stringType} found, not parsed yet");
+            else
+                Console.WriteLine($"{padding}Unknown type {resourceType} found, not parsed yet");
 
-                if (entry.Data[0] == 0x4D && entry.Data[1] == 0x5A)
-                {
-                    Console.WriteLine($"{padding}Data: [Embedded Executable File]"); // TODO: Parse this out and print separately
-                }
-                else if (entry.Data[0] == 0x4D && entry.Data[1] == 0x53 && entry.Data[2] == 0x46 && entry.Data[3] == 0x54)
-                {
-                    Console.WriteLine($"{padding}Data: [Embedded OLE Library File]"); // TODO: Parse this out and print separately
-                }
-                else
-                {
-                    //if (entry.Data != null)
-                    //    Console.WriteLine($"{padding}Value (ASCII): {Encoding.ASCII.GetString(entry.Data)}");
-                    //if (entry.Data != null)
-                    //    Console.WriteLine($"{padding}Value (UTF-8): {Encoding.UTF8.GetString(entry.Data)}");
-                    //if (entry.Data != null)
-                    //    Console.WriteLine($"{padding}Value (Unicode): {Encoding.Unicode.GetString(entry.Data)}");
-                }
+            // Then print the data, if needed
+            if (entry.Data[0] == 0x4D && entry.Data[1] == 0x5A)
+            {
+                Console.WriteLine($"{padding}Data: [Embedded Executable File]"); // TODO: Parse this out and print separately
+            }
+            else if (entry.Data[0] == 0x4D && entry.Data[1] == 0x53 && entry.Data[2] == 0x46 && entry.Data[3] == 0x54)
+            {
+                Console.WriteLine($"{padding}Data: [Embedded OLE Library File]"); // TODO: Parse this out and print separately
             }
             else
             {
-                Console.WriteLine($"{padding}Unknown type {resourceType} found, not parsed yet");
-
+                //if (entry.Data != null)
+                //    Console.WriteLine($"{padding}Value (Byte Data): {BitConverter.ToString(entry.Data).Replace('-', ' ')}");
                 //if (entry.Data != null)
                 //    Console.WriteLine($"{padding}Value (ASCII): {Encoding.ASCII.GetString(entry.Data)}");
                 //if (entry.Data != null)