7 files changed, 58 insertions, 55 deletions
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/ACI0.cs b/src/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
index 209e79d1..9a5b6b0a 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
@@ -9,17 +9,17 @@ namespace Ryujinx.HLE.Loaders.Npdm
 
         public ulong TitleId { get; set; }
 
-        public int   FsVersion            { get; private set; }
+        public int FsVersion { get; private set; }
         public ulong FsPermissionsBitmask { get; private set; }
 
         public ServiceAccessControl ServiceAccessControl { get; private set; }
-        public KernelAccessControl  KernelAccessControl  { get; private set; }
+        public KernelAccessControl KernelAccessControl { get; private set; }
 
         public Aci0(Stream stream, int offset)
         {
             stream.Seek(offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
             if (reader.ReadInt32() != Aci0Magic)
             {
@@ -33,16 +33,16 @@ namespace Ryujinx.HLE.Loaders.Npdm
             // Reserved.
             stream.Seek(8, SeekOrigin.Current);
 
-            int fsAccessHeaderOffset       = reader.ReadInt32();
-            int fsAccessHeaderSize         = reader.ReadInt32();
+            int fsAccessHeaderOffset = reader.ReadInt32();
+            int fsAccessHeaderSize = reader.ReadInt32();
             int serviceAccessControlOffset = reader.ReadInt32();
-            int serviceAccessControlSize   = reader.ReadInt32();
-            int kernelAccessControlOffset  = reader.ReadInt32();
-            int kernelAccessControlSize    = reader.ReadInt32();
+            int serviceAccessControlSize = reader.ReadInt32();
+            int kernelAccessControlOffset = reader.ReadInt32();
+            int kernelAccessControlSize = reader.ReadInt32();
 
-            FsAccessHeader fsAccessHeader = new FsAccessHeader(stream, offset + fsAccessHeaderOffset, fsAccessHeaderSize);
+            FsAccessHeader fsAccessHeader = new(stream, offset + fsAccessHeaderOffset, fsAccessHeaderSize);
 
-            FsVersion            = fsAccessHeader.Version;
+            FsVersion = fsAccessHeader.Version;
             FsPermissionsBitmask = fsAccessHeader.PermissionsBitmask;
 
             ServiceAccessControl = new ServiceAccessControl(stream, offset + serviceAccessControlOffset, serviceAccessControlSize);
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/ACID.cs b/src/Ryujinx.HLE/Loaders/Npdm/ACID.cs
index 365495c6..ab30b40c 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/ACID.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/ACID.cs
@@ -8,25 +8,25 @@ namespace Ryujinx.HLE.Loaders.Npdm
         private const int AcidMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
 
         public byte[] Rsa2048Signature { get; private set; }
-        public byte[] Rsa2048Modulus   { get; private set; }
-        public int    Unknown1         { get; private set; }
-        public int    Flags            { get; private set; }
+        public byte[] Rsa2048Modulus { get; private set; }
+        public int Unknown1 { get; private set; }
+        public int Flags { get; private set; }
 
         public long TitleIdRangeMin { get; private set; }
         public long TitleIdRangeMax { get; private set; }
 
-        public FsAccessControl      FsAccessControl      { get; private set; }
+        public FsAccessControl FsAccessControl { get; private set; }
         public ServiceAccessControl ServiceAccessControl { get; private set; }
-        public KernelAccessControl  KernelAccessControl  { get; private set; }
+        public KernelAccessControl KernelAccessControl { get; private set; }
 
         public Acid(Stream stream, int offset)
         {
             stream.Seek(offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
             Rsa2048Signature = reader.ReadBytes(0x100);
-            Rsa2048Modulus   = reader.ReadBytes(0x100);
+            Rsa2048Modulus = reader.ReadBytes(0x100);
 
             if (reader.ReadInt32() != AcidMagic)
             {
@@ -44,12 +44,12 @@ namespace Ryujinx.HLE.Loaders.Npdm
             TitleIdRangeMin = reader.ReadInt64();
             TitleIdRangeMax = reader.ReadInt64();
 
-            int fsAccessControlOffset      = reader.ReadInt32();
-            int fsAccessControlSize        = reader.ReadInt32();
+            int fsAccessControlOffset = reader.ReadInt32();
+            int fsAccessControlSize = reader.ReadInt32();
             int serviceAccessControlOffset = reader.ReadInt32();
-            int serviceAccessControlSize   = reader.ReadInt32();
-            int kernelAccessControlOffset  = reader.ReadInt32();
-            int kernelAccessControlSize    = reader.ReadInt32();
+            int serviceAccessControlSize = reader.ReadInt32();
+            int kernelAccessControlOffset = reader.ReadInt32();
+            int kernelAccessControlSize = reader.ReadInt32();
 
             FsAccessControl = new FsAccessControl(stream, offset + fsAccessControlOffset, fsAccessControlSize);
 
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs b/src/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
index d0f349ea..e533f513 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
@@ -4,25 +4,25 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     public class FsAccessControl
     {
-        public int   Version            { get; private set; }
+        public int Version { get; private set; }
         public ulong PermissionsBitmask { get; private set; }
-        public int   Unknown1           { get; private set; }
-        public int   Unknown2           { get; private set; }
-        public int   Unknown3           { get; private set; }
-        public int   Unknown4           { get; private set; }
+        public int Unknown1 { get; private set; }
+        public int Unknown2 { get; private set; }
+        public int Unknown3 { get; private set; }
+        public int Unknown4 { get; private set; }
 
         public FsAccessControl(Stream stream, int offset, int size)
         {
             stream.Seek(offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
-            Version            = reader.ReadInt32();
+            Version = reader.ReadInt32();
             PermissionsBitmask = reader.ReadUInt64();
-            Unknown1           = reader.ReadInt32();
-            Unknown2           = reader.ReadInt32();
-            Unknown3           = reader.ReadInt32();
-            Unknown4           = reader.ReadInt32();
+            Unknown1 = reader.ReadInt32();
+            Unknown2 = reader.ReadInt32();
+            Unknown3 = reader.ReadInt32();
+            Unknown4 = reader.ReadInt32();
         }
     }
 }
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs b/src/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
index 564b8dc3..7336464f 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
@@ -6,16 +6,16 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     class FsAccessHeader
     {
-        public int   Version            { get; private set; }
+        public int Version { get; private set; }
         public ulong PermissionsBitmask { get; private set; }
 
         public FsAccessHeader(Stream stream, int offset, int size)
         {
             stream.Seek(offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
-            Version            = reader.ReadInt32();
+            Version = reader.ReadInt32();
             PermissionsBitmask = reader.ReadUInt64();
 
             int dataSize = reader.ReadInt32();
@@ -24,8 +24,9 @@ namespace Ryujinx.HLE.Loaders.Npdm
             {
                 throw new InvalidNpdmException("FsAccessHeader is corrupted!");
             }
-
-            int contentOwnerIdSize        = reader.ReadInt32();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
+            int contentOwnerIdSize = reader.ReadInt32();
+#pragma warning restore IDE0059
             int dataAndContentOwnerIdSize = reader.ReadInt32();
 
             if (dataAndContentOwnerIdSize != 0x1c)
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs b/src/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
index 39803642..bc8bdbaa 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
@@ -12,7 +12,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
 
             Capabilities = new int[size / 4];
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
             for (int index = 0; index < Capabilities.Length; index++)
             {
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/Npdm.cs b/src/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
index 29a2b0fc..622d7ee0 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
@@ -11,22 +11,22 @@ namespace Ryujinx.HLE.Loaders.Npdm
     {
         private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
 
-        public byte   ProcessFlags        { get; private set; }
-        public bool   Is64Bit             { get; private set; }
-        public byte   MainThreadPriority  { get; private set; }
-        public byte   DefaultCpuId        { get; private set; }
-        public int    PersonalMmHeapSize  { get; private set; }
-        public int    Version             { get; private set; }
-        public int    MainThreadStackSize { get; private set; }
-        public string TitleName           { get;         set; }
-        public byte[] ProductCode         { get; private set; }
+        public byte ProcessFlags { get; private set; }
+        public bool Is64Bit { get; private set; }
+        public byte MainThreadPriority { get; private set; }
+        public byte DefaultCpuId { get; private set; }
+        public int PersonalMmHeapSize { get; private set; }
+        public int Version { get; private set; }
+        public int MainThreadStackSize { get; private set; }
+        public string TitleName { get; set; }
+        public byte[] ProductCode { get; private set; }
 
         public Aci0 Aci0 { get; private set; }
         public Acid Acid { get; private set; }
 
         public Npdm(Stream stream)
         {
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
             if (reader.ReadInt32() != MetaMagic)
             {
@@ -42,7 +42,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
             reader.ReadByte();
 
             MainThreadPriority = reader.ReadByte();
-            DefaultCpuId       = reader.ReadByte();
+            DefaultCpuId = reader.ReadByte();
 
             reader.ReadInt32();
 
@@ -61,9 +61,11 @@ namespace Ryujinx.HLE.Loaders.Npdm
             stream.Seek(0x30, SeekOrigin.Current);
 
             int aci0Offset = reader.ReadInt32();
-            int aci0Size   = reader.ReadInt32();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
+            int aci0Size = reader.ReadInt32();
             int acidOffset = reader.ReadInt32();
-            int acidSize   = reader.ReadInt32();
+            int acidSize = reader.ReadInt32();
+#pragma warning restore IDE0059
 
             Aci0 = new Aci0(stream, aci0Offset);
             Acid = new Acid(stream, acidOffset);
diff --git a/src/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/src/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
index 54012b8a..53c86434 100644
--- a/src/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
+++ b/src/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
@@ -13,11 +13,11 @@ namespace Ryujinx.HLE.Loaders.Npdm
         {
             stream.Seek(offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader reader = new(stream);
 
             int bytesRead = 0;
 
-            Dictionary<string, bool> services = new Dictionary<string, bool>();
+            Dictionary<string, bool> services = new();
 
             while (bytesRead != size)
             {
@@ -28,7 +28,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
                     break;
                 }
 
-                int  length          = (controlByte & 0x07) + 1;
+                int length = (controlByte & 0x07) + 1;
                 bool registerAllowed = (controlByte & 0x80) != 0;
 
                 services[Encoding.ASCII.GetString(reader.ReadBytes(length))] = registerAllowed;