[Ryujinx.HLE] Address dotnet-format issues (#5380)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2208 warnings

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address dotnet format CA2211 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Make dotnet format succeed in style mode

* Address or silence dotnet format CA2211 warnings

* Address review comments

* Address dotnet format CA2208 warnings properly

* Make ProcessResult readonly

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Add previously silenced warnings back

I have no clue how these disappeared

* Revert formatting changes for while and for-loops

* Format if-blocks correctly

* Run dotnet format style after rebase

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Fix a few disabled warnings

* Fix naming rule violation, Convert shader properties to auto-property and convert values to const

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Run dotnet format after rebase

* Use using declaration instead of block syntax

* Address IDE0251 warnings

* Address a few disabled IDE0060 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Fix naming rule violations

* Fix typo

* Add trailing commas, use targeted new and use array initializer

* Fix build issues

* Fix remaining build issues

* Remove SuppressMessage for CA1069 where possible

* Address dotnet format issues

* Address formatting issues

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Add GetHashCode implementation for RenderingSurfaceInfo

* Explicitly silence CA1822 for every affected method in Syscall

* Address formatting issues in Demangler.cs

* Address review feedback

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Revert marking service methods as static

* Next dotnet format pass

* Address review feedback

---------

Co-authored-by: Ac_K <acoustik666@gmail.com>

43 files changed, 235 insertions, 223 deletions

diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs
index bf86aaaa..6821c711 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs
@@ -102,4 +102,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs
index 93dff041..dd015fd8 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs
@@ -110,4 +110,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
index 0057eba3..d35cfdbe 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
@@ -10,16 +10,16 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
 {
     class ILibraryAppletAccessor : DisposableIpcService
     {
-        private KernelContext _kernelContext;
+        private readonly KernelContext _kernelContext;
 
-        private IApplet _applet;
+        private readonly IApplet _applet;
 
-        private AppletSession _normalSession;
-        private AppletSession _interactiveSession;
+        private readonly AppletSession _normalSession;
+        private readonly AppletSession _interactiveSession;
 
-        private KEvent _stateChangedEvent;
-        private KEvent _normalOutDataEvent;
-        private KEvent _interactiveOutDataEvent;
+        private readonly KEvent _stateChangedEvent;
+        private readonly KEvent _normalOutDataEvent;
+        private readonly KEvent _interactiveOutDataEvent;
 
         private int _stateChangedEventHandle;
         private int _normalOutDataEventHandle;
@@ -31,17 +31,17 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         {
             _kernelContext = system.KernelContext;
 
-            _stateChangedEvent       = new KEvent(system.KernelContext);
-            _normalOutDataEvent      = new KEvent(system.KernelContext);
+            _stateChangedEvent = new KEvent(system.KernelContext);
+            _normalOutDataEvent = new KEvent(system.KernelContext);
             _interactiveOutDataEvent = new KEvent(system.KernelContext);
 
             _applet = AppletManager.Create(appletId, system);
 
-            _normalSession      = new AppletSession();
+            _normalSession = new AppletSession();
             _interactiveSession = new AppletSession();
 
-            _applet.AppletStateChanged        += OnAppletStateChanged;
-            _normalSession.DataAvailable      += OnNormalOutData;
+            _applet.AppletStateChanged += OnAppletStateChanged;
+            _normalSession.DataAvailable += OnNormalOutData;
             _interactiveSession.DataAvailable += OnInteractiveOutData;
 
             Logger.Info?.Print(LogClass.ServiceAm, $"Applet '{appletId}' created.");
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/AppletStandalone.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/AppletStandalone.cs
index 69967c56..b523f02f 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/AppletStandalone.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/AppletStandalone.cs
@@ -4,13 +4,13 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
 {
     class AppletStandalone
     {
-        public AppletId          AppletId;
+        public AppletId AppletId;
         public LibraryAppletMode LibraryAppletMode;
-        public Queue<byte[]>     InputData;
+        public Queue<byte[]> InputData;
 
         public AppletStandalone()
         {
             InputData = new Queue<byte[]>();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs
index 176bd632..85bdd985 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
 {
     class ILibraryAppletSelfAccessor : IpcService
     {
-        private AppletStandalone _appletStandalone = new AppletStandalone();
+        private readonly AppletStandalone _appletStandalone = new();
 
         public ILibraryAppletSelfAccessor(ServiceCtx context)
         {
@@ -14,8 +14,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
                 // Create MiiEdit data.
                 _appletStandalone = new AppletStandalone()
                 {
-                    AppletId          = AppletId.MiiEdit,
-                    LibraryAppletMode = LibraryAppletMode.AllForeground
+                    AppletId = AppletId.MiiEdit,
+                    LibraryAppletMode = LibraryAppletMode.AllForeground,
                 };
 
                 byte[] miiEditInputData = new byte[0x100];
@@ -49,10 +49,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         // GetLibraryAppletInfo() -> nn::am::service::LibraryAppletInfo
         public ResultCode GetLibraryAppletInfo(ServiceCtx context)
         {
-            LibraryAppletInfo libraryAppletInfo = new LibraryAppletInfo()
+            LibraryAppletInfo libraryAppletInfo = new()
             {
-                AppletId          = _appletStandalone.AppletId,
-                LibraryAppletMode = _appletStandalone.LibraryAppletMode
+                AppletId = _appletStandalone.AppletId,
+                LibraryAppletMode = _appletStandalone.LibraryAppletMode,
             };
 
             context.ResponseData.WriteStruct(libraryAppletInfo);
@@ -64,10 +64,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         // GetCallerAppletIdentityInfo() -> nn::am::service::AppletIdentityInfo
         public ResultCode GetCallerAppletIdentityInfo(ServiceCtx context)
         {
-            AppletIdentifyInfo appletIdentifyInfo = new AppletIdentifyInfo()
+            AppletIdentifyInfo appletIdentifyInfo = new()
             {
                 AppletId = AppletId.QLaunch,
-                TitleId  = 0x0100000000001000
+                TitleId = 0x0100000000001000,
             };
 
             context.ResponseData.WriteStruct(appletIdentifyInfo);
@@ -75,4 +75,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs
index 6acd18cd..e1857fb3 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs
@@ -11,9 +11,9 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         public ResultCode GetLaunchReason(ServiceCtx context)
         {
             // NOTE: Flag is set by using an internal field.
-            AppletProcessLaunchReason appletProcessLaunchReason = new AppletProcessLaunchReason()
+            AppletProcessLaunchReason appletProcessLaunchReason = new()
             {
-                Flag = 0
+                Flag = 0,
             };
 
             context.ResponseData.WriteStruct(appletProcessLaunchReason);
@@ -21,4 +21,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAppletCommonFunctions.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAppletCommonFunctions.cs
index c42202b8..fbcc3320 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAppletCommonFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAppletCommonFunctions.cs
@@ -4,4 +4,4 @@
     {
         public IAppletCommonFunctions() { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IApplicationCreator.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IApplicationCreator.cs
index 79e5b050..502324ea 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IApplicationCreator.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IApplicationCreator.cs
@@ -4,4 +4,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     {
         public IApplicationCreator() { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs
index 48dd42e4..05a4b0a6 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs
@@ -10,8 +10,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // SetExpectedMasterVolume(f32, f32)
         public ResultCode SetExpectedMasterVolume(ServiceCtx context)
         {
-            float appletVolume        = context.RequestData.ReadSingle();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
+            float appletVolume = context.RequestData.ReadSingle();
             float libraryAppletVolume = context.RequestData.ReadSingle();
+#pragma warning restore IDE0059
 
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
@@ -44,8 +46,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // ChangeMainAppletMasterVolume(f32, u64)
         public ResultCode ChangeMainAppletMasterVolume(ServiceCtx context)
         {
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
             float unknown0 = context.RequestData.ReadSingle();
-            long  unknown1 = context.RequestData.ReadInt64();
+            long unknown1 = context.RequestData.ReadInt64();
+#pragma warning restore IDE0059
 
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
@@ -56,11 +60,13 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // SetTransparentVolumeRate(f32)
         public ResultCode SetTransparentVolumeRate(ServiceCtx context)
         {
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
             float unknown0 = context.RequestData.ReadSingle();
+#pragma warning restore IDE0059
 
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
index 5e7d0bae..0d2ec8bc 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
@@ -13,28 +13,28 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     {
         private readonly ServiceCtx _context;
 
-        private Apm.ManagerServer       _apmManagerServer;
-        private Apm.SystemManagerServer _apmSystemManagerServer;
-        private Lbl.LblControllerServer _lblControllerServer;
+        private readonly Apm.ManagerServer _apmManagerServer;
+        private readonly Apm.SystemManagerServer _apmSystemManagerServer;
+        private readonly Lbl.LblControllerServer _lblControllerServer;
 
         private bool _vrModeEnabled;
-#pragma warning disable CS0414
+#pragma warning disable CS0414, IDE0052 // Remove unread private member
         private bool _lcdBacklighOffEnabled;
         private bool _requestExitToLibraryAppletAtExecuteNextProgramEnabled;
-#pragma warning restore CS0414
-        private int  _messageEventHandle;
-        private int  _displayResolutionChangedEventHandle;
+#pragma warning restore CS0414, IDE0052
+        private int _messageEventHandle;
+        private int _displayResolutionChangedEventHandle;
 
-        private KEvent _acquiredSleepLockEvent;
+        private readonly KEvent _acquiredSleepLockEvent;
         private int _acquiredSleepLockEventHandle;
 
         public ICommonStateGetter(ServiceCtx context)
         {
             _context = context;
 
-            _apmManagerServer       = new Apm.ManagerServer(context);
+            _apmManagerServer = new Apm.ManagerServer(context);
             _apmSystemManagerServer = new Apm.SystemManagerServer(context);
-            _lblControllerServer    = new Lbl.LblControllerServer(context);
+            _lblControllerServer = new Lbl.LblControllerServer(context);
 
             _acquiredSleepLockEvent = new KEvent(context.Device.System.KernelContext);
         }
@@ -331,4 +331,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDebugFunctions.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDebugFunctions.cs
index 51a112fd..61cef13b 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDebugFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDebugFunctions.cs
@@ -4,4 +4,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     {
         public IDebugFunctions() { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs
index 92c97d86..6bd35a77 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs
@@ -8,9 +8,9 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
 {
     class IDisplayController : IpcService
     {
-        private KTransferMemory _transferMem;
-        private bool            _lastApplicationCaptureBufferAcquired;
-        private bool            _callerAppletCaptureBufferAcquired;
+        private readonly KTransferMemory _transferMem;
+        private bool _lastApplicationCaptureBufferAcquired;
+        private bool _callerAppletCaptureBufferAcquired;
 
         public IDisplayController(ServiceCtx context)
         {
@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         public ResultCode TakeScreenShotOfOwnLayer(ServiceCtx context)
         {
             bool unknown1 = context.RequestData.ReadBoolean();
-            int  unknown2 = context.RequestData.ReadInt32();
+            int unknown2 = context.RequestData.ReadInt32();
 
             Logger.Stub?.PrintStub(LogClass.ServiceAm, new { unknown1, unknown2 });
 
@@ -103,4 +103,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IGlobalStateController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IGlobalStateController.cs
index 24eeefb9..9e46d1cd 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IGlobalStateController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IGlobalStateController.cs
@@ -4,4 +4,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     {
         public IGlobalStateController() { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs
index c7c073ff..78f47e0e 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs
@@ -8,8 +8,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
 {
     class IHomeMenuFunctions : IpcService
     {
-        private KEvent _channelEvent;
-        private int    _channelEventHandle;
+        private readonly KEvent _channelEvent;
+        private int _channelEventHandle;
 
         public IHomeMenuFunctions(Horizon system)
         {
@@ -45,4 +45,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
index fb870c24..23ba99b0 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
@@ -11,8 +11,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // CreateLibraryApplet(u32, u32) -> object<nn::am::service::ILibraryAppletAccessor>
         public ResultCode CreateLibraryApplet(ServiceCtx context)
         {
-            AppletId appletId          = (AppletId)context.RequestData.ReadInt32();
-            int      libraryAppletMode = context.RequestData.ReadInt32();
+            AppletId appletId = (AppletId)context.RequestData.ReadInt32();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
+            int libraryAppletMode = context.RequestData.ReadInt32();
+#pragma warning restore IDE0059
 
             MakeObject(context, new ILibraryAppletAccessor(appletId, context.Device.System));
 
@@ -42,8 +44,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         public ResultCode CreateTransferMemoryStorage(ServiceCtx context)
         {
             bool isReadOnly = (context.RequestData.ReadInt64() & 1) == 0;
-            long size       = context.RequestData.ReadInt64();
-            int  handle     = context.Request.HandleDesc.ToCopy[0];
+            long size = context.RequestData.ReadInt64();
+            int handle = context.Request.HandleDesc.ToCopy[0];
 
             KTransferMemory transferMem = context.Process.HandleTable.GetObject<KTransferMemory>(handle);
 
@@ -67,8 +69,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // CreateHandleStorage(u64, handle<copy>) -> object<nn::am::service::IStorage>
         public ResultCode CreateHandleStorage(ServiceCtx context)
         {
-            long size   = context.RequestData.ReadInt64();
-            int  handle = context.Request.HandleDesc.ToCopy[0];
+            long size = context.RequestData.ReadInt64();
+            int handle = context.Request.HandleDesc.ToCopy[0];
 
             KTransferMemory transferMem = context.Process.HandleTable.GetObject<KTransferMemory>(handle);
 
@@ -88,4 +90,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
index 8f93117e..85898f13 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
@@ -11,30 +11,34 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     {
         private readonly ulong _pid;
 
-        private KEvent _libraryAppletLaunchableEvent;
-        private int    _libraryAppletLaunchableEventHandle;
+        private readonly KEvent _libraryAppletLaunchableEvent;
+        private int _libraryAppletLaunchableEventHandle;
 
         private KEvent _accumulatedSuspendedTickChangedEvent;
-        private int    _accumulatedSuspendedTickChangedEventHandle;
+        private int _accumulatedSuspendedTickChangedEventHandle;
 
         private readonly object _fatalSectionLock = new();
         private int _fatalSectionCount;
 
         // TODO: Set this when the game goes in suspension (go back to home menu ect), we currently don't support that so we can keep it set to 0.
-        private ulong _accumulatedSuspendedTickValue = 0;
+        private readonly ulong _accumulatedSuspendedTickValue = 0;
 
         // TODO: Determine where those fields are used.
-        private bool _screenShotPermission               = false;
-        private bool _operationModeChangedNotification   = false;
+#pragma warning disable IDE0052 // Remove unread private member
+        private bool _screenShotPermission = false;
+        private bool _operationModeChangedNotification = false;
         private bool _performanceModeChangedNotification = false;
-        private bool _restartMessageEnabled              = false;
-        private bool _outOfFocusSuspendingEnabled        = false;
-        private bool _handlesRequestToDisplay            = false;
-        private bool _autoSleepDisabled                  = false;
+        private bool _restartMessageEnabled = false;
+        private bool _outOfFocusSuspendingEnabled = false;
+        private bool _handlesRequestToDisplay = false;
+#pragma warning restore IDE0052
+        private bool _autoSleepDisabled = false;
+#pragma warning disable IDE0052 // Remove unread private member
         private bool _albumImageTakenNotificationEnabled = false;
         private bool _recordVolumeMuted = false;
 
         private uint _screenShotImageOrientation = 0;
+#pragma warning restore IDE0052
         private uint _idleTimeDetectionExtension = 0;
 
         public ISelfController(ServiceCtx context, ulong pid)
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs
index 730df5d0..46dc4916 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs
@@ -33,4 +33,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AlbumReportOption.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AlbumReportOption.cs
index 84fc5c83..e4b43495 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AlbumReportOption.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AlbumReportOption.cs
@@ -5,6 +5,6 @@
         OverlayNotDisplayed,
         OverlayDisplayed,
         Unknown2,
-        Unknown3
+        Unknown3,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AppletMessage.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AppletMessage.cs
index 2920c329..3f4600fa 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AppletMessage.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AppletMessage.cs
@@ -2,35 +2,35 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
 {
     enum AppletMessage
     {
-        None                             = 0,
-        ChangeIntoForeground             = 1,
-        ChangeIntoBackground             = 2,
-        Exit                             = 4,
-        ApplicationExited                = 6,
-        FocusStateChanged                = 15,
-        Resume                           = 16,
-        DetectShortPressingHomeButton    = 20,
-        DetectLongPressingHomeButton     = 21,
-        DetectShortPressingPowerButton   = 22,
-        DetectMiddlePressingPowerButton  = 23,
-        DetectLongPressingPowerButton    = 24,
-        RequestToPrepareSleep            = 25,
-        FinishedSleepSequence            = 26,
-        SleepRequiredByHighTemperature   = 27,
-        SleepRequiredByLowBattery        = 28,
-        AutoPowerDown                    = 29,
-        OperationModeChanged             = 30,
-        PerformanceModeChanged           = 31,
-        DetectReceivingCecSystemStandby  = 32,
-        SdCardRemoved                    = 33,
-        LaunchApplicationRequested       = 50,
-        RequestToDisplay                 = 51,
-        ShowApplicationLogo              = 55,
-        HideApplicationLogo              = 56,
-        ForceHideApplicationLogo         = 57,
-        FloatingApplicationDetected      = 60,
+        None = 0,
+        ChangeIntoForeground = 1,
+        ChangeIntoBackground = 2,
+        Exit = 4,
+        ApplicationExited = 6,
+        FocusStateChanged = 15,
+        Resume = 16,
+        DetectShortPressingHomeButton = 20,
+        DetectLongPressingHomeButton = 21,
+        DetectShortPressingPowerButton = 22,
+        DetectMiddlePressingPowerButton = 23,
+        DetectLongPressingPowerButton = 24,
+        RequestToPrepareSleep = 25,
+        FinishedSleepSequence = 26,
+        SleepRequiredByHighTemperature = 27,
+        SleepRequiredByLowBattery = 28,
+        AutoPowerDown = 29,
+        OperationModeChanged = 30,
+        PerformanceModeChanged = 31,
+        DetectReceivingCecSystemStandby = 32,
+        SdCardRemoved = 33,
+        LaunchApplicationRequested = 50,
+        RequestToDisplay = 51,
+        ShowApplicationLogo = 55,
+        HideApplicationLogo = 56,
+        ForceHideApplicationLogo = 57,
+        FloatingApplicationDetected = 60,
         DetectShortPressingCaptureButton = 90,
-        AlbumScreenShotTaken             = 92,
-        AlbumRecordingSaved              = 93
+        AlbumScreenShotTaken = 92,
+        AlbumRecordingSaved = 93,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/FocusState.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/FocusState.cs
index dfd7d7f2..afb7d6b4 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/FocusState.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/FocusState.cs
@@ -2,7 +2,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
 {
     enum FocusState
     {
-        InFocus    = 1,
-        OutOfFocus = 2
+        InFocus = 1,
+        OutOfFocus = 2,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/OperationMode.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/OperationMode.cs
index a82ed476..86125978 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/OperationMode.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/OperationMode.cs
@@ -3,6 +3,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
     enum OperationMode
     {
         Handheld = 0,
-        Docked   = 1
+        Docked = 1,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/WirelessPriorityMode.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/WirelessPriorityMode.cs
index e8ba9b61..3ea923f5 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/WirelessPriorityMode.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/WirelessPriorityMode.cs
@@ -4,6 +4,6 @@
     {
         Default,
         OptimizedForWlan,
-        Unknown2
+        Unknown2,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
index fb16c86e..e7482b78 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     internal class AppletFifo<T> : IAppletFifo<T>
     {
-        private ConcurrentQueue<T> _dataQueue;
+        private readonly ConcurrentQueue<T> _dataQueue;
 
         public event EventHandler DataAvailable;
 
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletSession.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletSession.cs
index 6c9197b3..63eb2ca5 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletSession.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletSession.cs
@@ -4,8 +4,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     internal class AppletSession
     {
-        private IAppletFifo<byte[]> _inputData;
-        private IAppletFifo<byte[]> _outputData;
+        private readonly IAppletFifo<byte[]> _inputData;
+        private readonly IAppletFifo<byte[]> _outputData;
 
         public event EventHandler DataAvailable;
 
@@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
             IAppletFifo<byte[]> inputData,
             IAppletFifo<byte[]> outputData)
         {
-            _inputData  = inputData;
+            _inputData = inputData;
             _outputData = outputData;
 
             _inputData.DataAvailable += OnDataAvailable;
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs
index 728a1018..0a032562 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs
@@ -26,4 +26,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs
index 190f1a51..311084aa 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs
@@ -2,13 +2,13 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     class IStorage : IpcService
     {
-        public bool   IsReadOnly { get; private set; }
-        public byte[] Data       { get; private set; }
+        public bool IsReadOnly { get; private set; }
+        public byte[] Data { get; private set; }
 
         public IStorage(byte[] data, bool isReadOnly = false)
         {
             IsReadOnly = isReadOnly;
-            Data       = data;
+            Data = data;
         }
 
         [CommandCmif(0)]
@@ -20,4 +20,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs
index 4c7e264d..54c7b69e 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     class IStorageAccessor : IpcService
     {
-        private IStorage _storage;
+        private readonly IStorage _storage;
 
         public IStorageAccessor(IStorage storage)
         {
@@ -83,4 +83,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Storage/StorageHelper.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Storage/StorageHelper.cs
index 49e342f2..ef5951d7 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Storage/StorageHelper.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Storage/StorageHelper.cs
@@ -11,18 +11,16 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.Storage
         public static byte[] MakeLaunchParams(UserProfile userProfile)
         {
             // Size needs to be at least 0x88 bytes otherwise application errors.
-            using (MemoryStream ms = MemoryStreamManager.Shared.GetStream())
-            {
-                BinaryWriter writer = new BinaryWriter(ms);
+            using MemoryStream ms = MemoryStreamManager.Shared.GetStream();
+            BinaryWriter writer = new(ms);
 
-                ms.SetLength(0x88);
+            ms.SetLength(0x88);
 
-                writer.Write(LaunchParamsMagic);
-                writer.Write(1);  // IsAccountSelected? Only lower 8 bits actually used.
-                userProfile.UserId.Write(writer);
+            writer.Write(LaunchParamsMagic);
+            writer.Write(1);  // IsAccountSelected? Only lower 8 bits actually used.
+            userProfile.UserId.Write(writer);
 
-                return ms.ToArray();
-            }
+            return ms.ToArray();
         }
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletId.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletId.cs
index 917f6865..503de4d2 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletId.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletId.cs
@@ -2,26 +2,26 @@
 {
     enum AppletId
     {
-        Application          = 0x01,
-        OverlayDisplay       = 0x02,
-        QLaunch              = 0x03,
-        Starter              = 0x04,
-        Auth                 = 0x0A,
-        Cabinet              = 0x0B,
-        Controller           = 0x0C,
-        DataErase            = 0x0D,
-        Error                = 0x0E,
-        NetConnect           = 0x0F,
-        PlayerSelect         = 0x10,
-        SoftwareKeyboard     = 0x11,
-        MiiEdit              = 0x12,
-        LibAppletWeb         = 0x13,
-        LibAppletShop        = 0x14,
-        PhotoViewer          = 0x15,
-        Settings             = 0x16,
-        LibAppletOff         = 0x17,
+        Application = 0x01,
+        OverlayDisplay = 0x02,
+        QLaunch = 0x03,
+        Starter = 0x04,
+        Auth = 0x0A,
+        Cabinet = 0x0B,
+        Controller = 0x0C,
+        DataErase = 0x0D,
+        Error = 0x0E,
+        NetConnect = 0x0F,
+        PlayerSelect = 0x10,
+        SoftwareKeyboard = 0x11,
+        MiiEdit = 0x12,
+        LibAppletWeb = 0x13,
+        LibAppletShop = 0x14,
+        PhotoViewer = 0x15,
+        Settings = 0x16,
+        LibAppletOff = 0x17,
         LibAppletWhitelisted = 0x18,
-        LibAppletAuth        = 0x19,
-        MyPage               = 0x1A
+        LibAppletAuth = 0x19,
+        MyPage = 0x1A,
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletIdentityInfo.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletIdentityInfo.cs
index 17a485ab..84fd1b4c 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletIdentityInfo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletIdentityInfo.cs
@@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
     struct AppletIdentifyInfo
     {
         public AppletId AppletId;
-        public uint     Padding;
-        public ulong    TitleId;
+        public uint Padding;
+        public ulong TitleId;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletProcessLaunchReason.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletProcessLaunchReason.cs
index 6c528337..b6c32da5 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletProcessLaunchReason.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/AppletProcessLaunchReason.cs
@@ -5,8 +5,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
     [StructLayout(LayoutKind.Sequential, Size = 0x4)]
     struct AppletProcessLaunchReason
     {
-        public byte   Flag;
+        public byte Flag;
         public ushort Unknown1;
-        public byte   Unknown2;
+        public byte Unknown2;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletInfo.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletInfo.cs
index fc1c11e4..1205a7dc 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletInfo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletInfo.cs
@@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
     [StructLayout(LayoutKind.Sequential, Size = 0x8)]
     struct LibraryAppletInfo
     {
-        public AppletId          AppletId;
+        public AppletId AppletId;
         public LibraryAppletMode LibraryAppletMode;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletMode.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletMode.cs
index 6b9a2284..044a3168 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletMode.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/Types/LibraryAppletMode.cs
@@ -9,6 +9,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
         PartialForeground,
         NoUi,
         PartialForegroundWithIndirectDisplay,
-        AllForegroundInitiallyHidden
+        AllForegroundInitiallyHidden,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
index 5ae8f459..271d0060 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs
@@ -1,5 +1,4 @@
 using LibHac.Account;
-using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Ncm;
 using LibHac.Ns;
@@ -18,20 +17,20 @@ using Ryujinx.Horizon.Common;
 using System;
 using System.Numerics;
 using System.Threading;
-using AccountUid    = Ryujinx.HLE.HOS.Services.Account.Acc.UserId;
+using AccountUid = Ryujinx.HLE.HOS.Services.Account.Acc.UserId;
 using ApplicationId = LibHac.Ncm.ApplicationId;
 
 namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy
 {
     class IApplicationFunctions : IpcService
     {
-        private long _defaultSaveDataSize        = 200000000;
+        private long _defaultSaveDataSize = 200000000;
         private long _defaultJournalSaveDataSize = 200000000;
 
-        private KEvent _gpuErrorDetectedSystemEvent;
-        private KEvent _friendInvitationStorageChannelEvent;
-        private KEvent _notificationStorageChannelEvent;
-        private KEvent _healthWarningDisappearedSystemEvent;
+        private readonly KEvent _gpuErrorDetectedSystemEvent;
+        private readonly KEvent _friendInvitationStorageChannelEvent;
+        private readonly KEvent _notificationStorageChannelEvent;
+        private readonly KEvent _healthWarningDisappearedSystemEvent;
 
         private int _gpuErrorDetectedSystemEventHandle;
         private int _friendInvitationStorageChannelEventHandle;
@@ -42,14 +41,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
 
         private int _jitLoaded;
 
-        private LibHac.HorizonClient _horizon;
+        private readonly LibHac.HorizonClient _horizon;
 
         public IApplicationFunctions(Horizon system)
         {
             // TODO: Find where they are signaled.
-            _gpuErrorDetectedSystemEvent         = new KEvent(system.KernelContext);
+            _gpuErrorDetectedSystemEvent = new KEvent(system.KernelContext);
             _friendInvitationStorageChannelEvent = new KEvent(system.KernelContext);
-            _notificationStorageChannelEvent     = new KEvent(system.KernelContext);
+            _notificationStorageChannelEvent = new KEvent(system.KernelContext);
             _healthWarningDisappearedSystemEvent = new KEvent(system.KernelContext);
 
             _horizon = system.LibHacHorizonManager.AmClient;
@@ -115,7 +114,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
             Uid userId = context.RequestData.ReadStruct<AccountUid>().ToLibHacUid();
 
             // Mask out the low nibble of the program ID to get the application ID
-            ApplicationId applicationId = new ApplicationId(context.Device.Processes.ActiveApplication.ProgramId & ~0xFul);
+            ApplicationId applicationId = new(context.Device.Processes.ActiveApplication.ProgramId & ~0xFul);
 
             ApplicationControlProperty nacp = context.Device.Processes.ActiveApplication.ApplicationControlProperties;
 
@@ -137,8 +136,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
             // TODO: When above calls are implemented, switch to using ns:am
 
             long desiredLanguageCode = context.Device.System.State.DesiredLanguageCode;
-            int  supportedLanguages  = (int)context.Device.Processes.ActiveApplication.ApplicationControlProperties.SupportedLanguageFlag;
-            int  firstSupported      = BitOperations.TrailingZeroCount(supportedLanguages);
+            int supportedLanguages = (int)context.Device.Processes.ActiveApplication.ApplicationControlProperties.SupportedLanguageFlag;
+            int firstSupported = BitOperations.TrailingZeroCount(supportedLanguages);
 
             if (firstSupported > (int)TitleLanguage.BrazilianPortuguese)
             {
@@ -168,7 +167,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
         // SetTerminateResult(u32)
         public ResultCode SetTerminateResult(ServiceCtx context)
         {
-            LibHac.Result result = new LibHac.Result(context.RequestData.ReadUInt32());
+            LibHac.Result result = new(context.RequestData.ReadUInt32());
 
             Logger.Info?.Print(LogClass.ServiceAm, $"Result = 0x{result.Value:x8} ({result.ToStringWithName()}).");
 
@@ -190,14 +189,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
         public ResultCode ExtendSaveData(ServiceCtx context)
         {
             SaveDataType saveDataType = (SaveDataType)context.RequestData.ReadUInt64();
-            Uid          userId       = context.RequestData.ReadStruct<Uid>();
-            long        saveDataSize  = context.RequestData.ReadInt64();
-            long        journalSize   = context.RequestData.ReadInt64();
+            Uid userId = context.RequestData.ReadStruct<Uid>();
+            long saveDataSize = context.RequestData.ReadInt64();
+            long journalSize = context.RequestData.ReadInt64();
 
             // NOTE: Service calls nn::fs::ExtendApplicationSaveData.
             //       Since LibHac currently doesn't support this method, we can stub it for now.
 
-            _defaultSaveDataSize        = saveDataSize;
+            _defaultSaveDataSize = saveDataSize;
             _defaultJournalSaveDataSize = journalSize;
 
             context.ResponseData.Write((uint)ResultCode.Success);
@@ -212,7 +211,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
         public ResultCode GetSaveDataSize(ServiceCtx context)
         {
             SaveDataType saveDataType = (SaveDataType)context.RequestData.ReadUInt64();
-            Uid          userId       = context.RequestData.ReadStruct<Uid>();
+            Uid userId = context.RequestData.ReadStruct<Uid>();
 
             // NOTE: Service calls nn::fs::FindSaveDataWithFilter with SaveDataType = 1 hardcoded.
             //       Then it calls nn::fs::GetSaveDataAvailableSize and nn::fs::GetSaveDataJournalSize to get the sizes.
@@ -235,14 +234,17 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
             long journalSize = context.RequestData.ReadInt64();
 
             // Mask out the low nibble of the program ID to get the application ID
-            ApplicationId applicationId = new ApplicationId(context.Device.Processes.ActiveApplication.ProgramId & ~0xFul);
+            ApplicationId applicationId = new(context.Device.Processes.ActiveApplication.ProgramId & ~0xFul);
 
             ApplicationControlProperty nacp = context.Device.Processes.ActiveApplication.ApplicationControlProperties;
 
             LibHac.Result result = _horizon.Fs.CreateApplicationCacheStorage(out long requiredSize,
                 out CacheStorageTargetMedia storageTarget, applicationId, in nacp, index, saveSize, journalSize);
 
-            if (result.IsFailure()) return (ResultCode)result.Value;
+            if (result.IsFailure())
+            {
+                return (ResultCode)result.Value;
+            }
 
             context.ResponseData.Write((ulong)storageTarget);
             context.ResponseData.Write(requiredSize);
@@ -391,10 +393,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
         // InitializeApplicationCopyrightFrameBuffer(s32 width, s32 height, handle<copy, transfer_memory> transfer_memory, u64 transfer_memory_size)
         public ResultCode InitializeApplicationCopyrightFrameBuffer(ServiceCtx context)
         {
-            int   width                 = context.RequestData.ReadInt32();
-            int   height                = context.RequestData.ReadInt32();
-            ulong transferMemorySize    = context.RequestData.ReadUInt64();
-            int   transferMemoryHandle  = context.Request.HandleDesc.ToCopy[0];
+            int width = context.RequestData.ReadInt32();
+            int height = context.RequestData.ReadInt32();
+            ulong transferMemorySize = context.RequestData.ReadUInt64();
+            int transferMemoryHandle = context.Request.HandleDesc.ToCopy[0];
             ulong transferMemoryAddress = context.Process.HandleTable.GetObject<KTransferMemory>(transferMemoryHandle).Address;
 
             ResultCode resultCode = ResultCode.InvalidParameters;
@@ -437,13 +439,13 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
         // SetApplicationCopyrightImage(buffer<bytes, 0x45> frame_buffer, s32 x, s32 y, s32 width, s32 height, s32 window_origin_mode)
         public ResultCode SetApplicationCopyrightImage(ServiceCtx context)
         {
-            ulong frameBufferPos   = context.Request.SendBuff[0].Position;
-            ulong frameBufferSize  = context.Request.SendBuff[0].Size;
-            int   x                = context.RequestData.ReadInt32();
-            int   y                = context.RequestData.ReadInt32();
-            int   width            = context.RequestData.ReadInt32();
-            int   height           = context.RequestData.ReadInt32();
-            uint  windowOriginMode = context.RequestData.ReadUInt32();
+            ulong frameBufferPos = context.Request.SendBuff[0].Position;
+            ulong frameBufferSize = context.Request.SendBuff[0].Size;
+            int x = context.RequestData.ReadInt32();
+            int y = context.RequestData.ReadInt32();
+            int width = context.RequestData.ReadInt32();
+            int height = context.RequestData.ReadInt32();
+            uint windowOriginMode = context.RequestData.ReadUInt32();
 
             ResultCode resultCode = ResultCode.InvalidParameters;
 
@@ -653,11 +655,11 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
             if (Interlocked.Exchange(ref _jitLoaded, 1) == 0)
             {
                 string jitPath = context.Device.System.ContentManager.GetInstalledContentPath(0x010000000000003B, StorageId.BuiltInSystem, NcaContentType.Program);
-                string filePath = context.Device.FileSystem.SwitchPathToSystemPath(jitPath);
+                string filePath = FileSystem.VirtualFileSystem.SwitchPathToSystemPath(jitPath);
 
                 if (string.IsNullOrWhiteSpace(filePath))
                 {
-                    throw new InvalidSystemResourceException($"JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx#requirements for more information)");
+                    throw new InvalidSystemResourceException("JIT (010000000000003B) system title not found! The JIT will not work, provide the system archive to fix this error. (See https://github.com/Ryujinx/Ryujinx#requirements for more information)");
                 }
 
                 context.Device.LoadNca(filePath);
@@ -672,4 +674,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/LaunchParameterKind.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/LaunchParameterKind.cs
index 40432074..7d82dcf5 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/LaunchParameterKind.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/LaunchParameterKind.cs
@@ -4,6 +4,6 @@
     {
         UserChannel = 1,
         PreselectedUser,
-        Unknown
+        Unknown,
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/ProgramSpecifyKind.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/ProgramSpecifyKind.cs
index efc284a5..29ecf421 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/ProgramSpecifyKind.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/Types/ProgramSpecifyKind.cs
@@ -4,6 +4,6 @@
     {
         ExecuteProgram,
         SubApplicationProgram,
-        RestartProgram
+        RestartProgram,
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs
index 50e3be27..b24e1bf4 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs
@@ -84,4 +84,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs
index 3a4c71e4..9814976f 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs
@@ -16,4 +16,4 @@ namespace Ryujinx.HLE.HOS.Services.Am
             return ResultCode.Success;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/Idle/IPolicyManagerSystem.cs b/src/Ryujinx.HLE/HOS/Services/Am/Idle/IPolicyManagerSystem.cs
index 8c72319c..824d4c22 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/Idle/IPolicyManagerSystem.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/Idle/IPolicyManagerSystem.cs
@@ -5,4 +5,4 @@
     {
         public IPolicyManagerSystem(ServiceCtx context) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/Omm/IOperationModeManager.cs b/src/Ryujinx.HLE/HOS/Services/Am/Omm/IOperationModeManager.cs
index 2856e6d7..44c4dafc 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/Omm/IOperationModeManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/Omm/IOperationModeManager.cs
@@ -5,4 +5,4 @@
     {
         public IOperationModeManager(ServiceCtx context) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/ResultCode.cs b/src/Ryujinx.HLE/HOS/Services/Am/ResultCode.cs
index 5cafff67..9142f65e 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/ResultCode.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/ResultCode.cs
@@ -2,29 +2,29 @@ namespace Ryujinx.HLE.HOS.Services.Am
 {
     enum ResultCode
     {
-        ModuleId       = 128,
+        ModuleId = 128,
         ErrorCodeShift = 9,
 
         Success = 0,
 
-        NotAvailable           = (2   << ErrorCodeShift) | ModuleId,
-        NoMessages             = (3   << ErrorCodeShift) | ModuleId,
-        AppletLaunchFailed     = (35  << ErrorCodeShift) | ModuleId,
-        TitleIdNotFound        = (37  << ErrorCodeShift) | ModuleId,
-        ObjectInvalid          = (500 << ErrorCodeShift) | ModuleId,
-        IStorageInUse          = (502 << ErrorCodeShift) | ModuleId,
-        OutOfBounds            = (503 << ErrorCodeShift) | ModuleId,
-        BufferNotAcquired      = (504 << ErrorCodeShift) | ModuleId,
-        BufferAlreadyAcquired  = (505 << ErrorCodeShift) | ModuleId,
-        InvalidParameters      = (506 << ErrorCodeShift) | ModuleId,
-        OpenedAsWrongType      = (511 << ErrorCodeShift) | ModuleId,
+        NotAvailable = (2 << ErrorCodeShift) | ModuleId,
+        NoMessages = (3 << ErrorCodeShift) | ModuleId,
+        AppletLaunchFailed = (35 << ErrorCodeShift) | ModuleId,
+        TitleIdNotFound = (37 << ErrorCodeShift) | ModuleId,
+        ObjectInvalid = (500 << ErrorCodeShift) | ModuleId,
+        IStorageInUse = (502 << ErrorCodeShift) | ModuleId,
+        OutOfBounds = (503 << ErrorCodeShift) | ModuleId,
+        BufferNotAcquired = (504 << ErrorCodeShift) | ModuleId,
+        BufferAlreadyAcquired = (505 << ErrorCodeShift) | ModuleId,
+        InvalidParameters = (506 << ErrorCodeShift) | ModuleId,
+        OpenedAsWrongType = (511 << ErrorCodeShift) | ModuleId,
         UnbalancedFatalSection = (512 << ErrorCodeShift) | ModuleId,
-        NullObject             = (518 << ErrorCodeShift) | ModuleId,
+        NullObject = (518 << ErrorCodeShift) | ModuleId,
         MemoryAllocationFailed = (600 << ErrorCodeShift) | ModuleId,
-        StackPoolExhausted     = (712 << ErrorCodeShift) | ModuleId,
-        DebugModeNotEnabled    = (974 << ErrorCodeShift) | ModuleId,
-        DevFunctionNotEnabled  = (980 << ErrorCodeShift) | ModuleId,
-        NotImplemented         = (998 << ErrorCodeShift) | ModuleId,
-        Stubbed                = (999 << ErrorCodeShift) | ModuleId
+        StackPoolExhausted = (712 << ErrorCodeShift) | ModuleId,
+        DebugModeNotEnabled = (974 << ErrorCodeShift) | ModuleId,
+        DevFunctionNotEnabled = (980 << ErrorCodeShift) | ModuleId,
+        NotImplemented = (998 << ErrorCodeShift) | ModuleId,
+        Stubbed = (999 << ErrorCodeShift) | ModuleId,
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/Spsm/IPowerStateInterface.cs b/src/Ryujinx.HLE/HOS/Services/Am/Spsm/IPowerStateInterface.cs
index a393f76b..40a1300c 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/Spsm/IPowerStateInterface.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/Spsm/IPowerStateInterface.cs
@@ -5,4 +5,4 @@
     {
         public IPowerStateInterface(ServiceCtx context) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/Tcap/IManager.cs b/src/Ryujinx.HLE/HOS/Services/Am/Tcap/IManager.cs
index b31ccf8a..edb9618c 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/Tcap/IManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/Tcap/IManager.cs
@@ -5,4 +5,4 @@
     {
         public IManager(ServiceCtx context) { }
     }
-}
\ No newline at end of file
+}