diff --git a/RomRepoMgr.Core/Filesystem/Winfsp.cs b/RomRepoMgr.Core/Filesystem/Winfsp.cs
index 2ff6861..de388aa 100644
--- a/RomRepoMgr.Core/Filesystem/Winfsp.cs
+++ b/RomRepoMgr.Core/Filesystem/Winfsp.cs
@@ -370,7 +370,7 @@ public class Winfsp : FileSystemBase
     {
         bytesTransferred = 0;
 
-        if(fileNode is not FileNode node || node.Handle <= 0) return STATUS_INVALID_HANDLE;
+        if(fileNode is not FileNode { Handle: > 0 } node) return STATUS_INVALID_HANDLE;
 
         var buf = new byte[length];
 
@@ -402,7 +402,7 @@ public class Winfsp : FileSystemBase
         fileName = default(string);
         fileInfo = default(FileInfo);
 
-        if(fileNode is not FileNode node || !node.IsDirectory) return false;
+        if(fileNode is not FileNode { IsDirectory: true } node) return false;
 
         if(context is not IEnumerator<FileEntry> enumerator)
         {
diff --git a/RomRepoMgr/App.xaml.cs b/RomRepoMgr/App.xaml.cs
index 22ca043..1b60e1d 100644
--- a/RomRepoMgr/App.xaml.cs
+++ b/RomRepoMgr/App.xaml.cs
@@ -80,9 +80,13 @@ public class App : Application
 
     void OnAboutClicked(object sender, EventArgs args)
     {
-        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-           desktop.MainWindow is not MainWindow mainWindow                            ||
-           mainWindow.DataContext is not MainWindowViewModel mainWindowViewModel)
+        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime
+                                      {
+                                          MainWindow: MainWindow
+                                                      {
+                                                          DataContext: MainWindowViewModel mainWindowViewModel
+                                                      }
+                                      })
             return;
 
         mainWindowViewModel.ExecuteAboutCommand();
@@ -90,9 +94,13 @@ public class App : Application
 
     void OnQuitClicked(object sender, EventArgs args)
     {
-        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-           desktop.MainWindow is not MainWindow mainWindow                            ||
-           mainWindow.DataContext is not MainWindowViewModel mainWindowViewModel)
+        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime
+                                      {
+                                          MainWindow: MainWindow
+                                                      {
+                                                          DataContext: MainWindowViewModel mainWindowViewModel
+                                                      }
+                                      })
             return;
 
         mainWindowViewModel.ExecuteExitCommand();
@@ -100,9 +108,13 @@ public class App : Application
 
     void OnPreferencesClicked(object sender, EventArgs args)
     {
-        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-           desktop.MainWindow is not MainWindow mainWindow                            ||
-           mainWindow.DataContext is not MainWindowViewModel mainWindowViewModel)
+        if(ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime
+                                      {
+                                          MainWindow: MainWindow
+                                                      {
+                                                          DataContext: MainWindowViewModel mainWindowViewModel
+                                                      }
+                                      })
             return;
 
         mainWindowViewModel.ExecuteSettingsCommand();