diff --git a/src/Ryujinx.HLE/HOS/Horizon.cs b/src/Ryujinx.HLE/HOS/Horizon.cs
index 15187ef3b..c585aed54 100644
--- a/src/Ryujinx.HLE/HOS/Horizon.cs
+++ b/src/Ryujinx.HLE/HOS/Horizon.cs
@@ -339,10 +339,10 @@ namespace Ryujinx.HLE.HOS
 
         public void ScanAmiibo(int nfpDeviceId, string amiiboId, bool useRandomUuid)
         {
-            if (VirtualAmiibo.applicationBytes.Length > 0)
+            if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.applicationBytes = new byte[0];
-                VirtualAmiibo.inputBin = string.Empty;
+                VirtualAmiibo.ApplicationBytes = new byte[0];
+                VirtualAmiibo.InputBin = string.Empty;
             }
             if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag)
             {
@@ -353,10 +353,10 @@ namespace Ryujinx.HLE.HOS
         }
         public void ScanAmiiboFromBin(string path)
         {
-            VirtualAmiibo.inputBin = path;
-            if (VirtualAmiibo.applicationBytes.Length > 0)
+            VirtualAmiibo.InputBin = path;
+            if (VirtualAmiibo.ApplicationBytes.Length > 0)
             {
-                VirtualAmiibo.applicationBytes = new byte[0];
+                VirtualAmiibo.ApplicationBytes = new byte[0];
             }
             byte[] encryptedData = File.ReadAllBytes(path);
             VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData);
diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
index 68bc978fc..13a5ef998 100644
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
@@ -140,9 +140,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
             };
             if (writeCounterValue > 0)
             {
-                VirtualAmiibo.applicationBytes = applicationAreas;
+                VirtualAmiibo.ApplicationBytes = applicationAreas;
             }
-            VirtualAmiibo.nickName = nickName;
+            VirtualAmiibo.NickName = nickName;
             return virtualAmiiboFile;
         }
         public static bool SaveBinFile(string inputFile, byte[] appData)
diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
index 06570cfbf..fa39cb030 100644
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
@@ -14,10 +14,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
 {
     static class VirtualAmiibo
     {
-        public static uint _openedApplicationAreaId;
-        public static byte[] applicationBytes = new byte[0];
-        public static string inputBin = string.Empty;
-        public static string nickName = string.Empty;
+        public static uint OpenedApplicationAreaId;
+        public static byte[] ApplicationBytes = new byte[0];
+        public static string InputBin = string.Empty;
+        public static string NickName = string.Empty;
         private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default;
         public static byte[] GenerateUuid(string amiiboId, bool useRandomUuid)
         {
@@ -70,10 +70,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
         {
             VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
             string nickname = amiiboFile.NickName ?? "Ryujinx";
-            if (nickName != string.Empty)
+            if (NickName != string.Empty)
             {
-                nickname = nickName;
-                nickName = string.Empty;
+                nickname = NickName;
+                NickName = string.Empty;
             }
             UtilityImpl utilityImpl = new(tickSource);
             CharInfo charInfo = new();
@@ -104,9 +104,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
         {
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
             virtualAmiiboFile.NickName = newNickName;
-            if (inputBin != string.Empty)
+            if (InputBin != string.Empty)
             {
-                AmiiboBinReader.SaveBinFile(inputBin, virtualAmiiboFile.NickName);
+                AmiiboBinReader.SaveBinFile(InputBin, virtualAmiiboFile.NickName);
                 return;
             }
             SaveAmiiboFile(virtualAmiiboFile);
@@ -115,15 +115,15 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
         public static bool OpenApplicationArea(string amiiboId, uint applicationAreaId)
         {
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
-            if (applicationBytes.Length > 0)
+            if (ApplicationBytes.Length > 0)
             {
-                _openedApplicationAreaId = applicationAreaId;
+                OpenedApplicationAreaId = applicationAreaId;
                 return true;
             }
 
             if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == applicationAreaId))
             {
-                _openedApplicationAreaId = applicationAreaId;
+                OpenedApplicationAreaId = applicationAreaId;
 
                 return true;
             }
@@ -133,17 +133,17 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
 
         public static byte[] GetApplicationArea(string amiiboId)
         {
-            if (applicationBytes.Length > 0)
+            if (ApplicationBytes.Length > 0)
             {
-                byte[] bytes = applicationBytes;
-                applicationBytes = new byte[0];
+                byte[] bytes = ApplicationBytes;
+                ApplicationBytes = new byte[0];
                 return bytes;
             }
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
 
             foreach (VirtualAmiiboApplicationArea applicationArea in virtualAmiiboFile.ApplicationAreas)
             {
-                if (applicationArea.ApplicationAreaId == _openedApplicationAreaId)
+                if (applicationArea.ApplicationAreaId == OpenedApplicationAreaId)
                 {
                     return applicationArea.ApplicationArea;
                 }
@@ -174,22 +174,22 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
 
         public static void SetApplicationArea(string amiiboId, byte[] applicationAreaData)
         {
-            if (inputBin != string.Empty)
+            if (InputBin != string.Empty)
             {
-                AmiiboBinReader.SaveBinFile(inputBin, applicationAreaData);
+                AmiiboBinReader.SaveBinFile(InputBin, applicationAreaData);
                 return;
             }
             VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
 
-            if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == _openedApplicationAreaId))
+            if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == OpenedApplicationAreaId))
             {
                 for (int i = 0; i < virtualAmiiboFile.ApplicationAreas.Count; i++)
                 {
-                    if (virtualAmiiboFile.ApplicationAreas[i].ApplicationAreaId == _openedApplicationAreaId)
+                    if (virtualAmiiboFile.ApplicationAreas[i].ApplicationAreaId == OpenedApplicationAreaId)
                     {
                         virtualAmiiboFile.ApplicationAreas[i] = new VirtualAmiiboApplicationArea()
                         {
-                            ApplicationAreaId = _openedApplicationAreaId,
+                            ApplicationAreaId = OpenedApplicationAreaId,
                             ApplicationArea = applicationAreaData,
                         };
 
@@ -240,7 +240,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
 
         public static bool SaveFileExists(VirtualAmiiboFile virtualAmiiboFile)
         {
-            if (inputBin != string.Empty)
+            if (InputBin != string.Empty)
             {
                 SaveAmiiboFile(virtualAmiiboFile);
                 return true;
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index b1d4a3b37..0496b161e 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -74,7 +74,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         private string _shaderCountText;
         private bool _isAmiiboRequested;
         private bool _isAmiiboBinRequested;
-        private bool _showRightmostSeparator;
         private bool _showShaderCompilationHint;
         private bool _isGameRunning;
         private bool _isFullScreen;