diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index b5868ca1..94bcb7ef 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -301,7 +301,7 @@ namespace SourceGit
                     return await clipboard.GetTextAsync();
                 }
             }
-            return default;
+            return null;
         }
 
         public static string Text(string key, params object[] args)
@@ -323,8 +323,7 @@ namespace SourceGit
             icon.Height = 12;
             icon.Stretch = Stretch.Uniform;
 
-            var geo = Current?.FindResource(key) as StreamGeometry;
-            if (geo != null)
+            if (Current?.FindResource(key) is StreamGeometry geo)
                 icon.Data = geo;
 
             return icon;
@@ -682,8 +681,7 @@ namespace SourceGit
                 }
 
                 var name = sb.ToString();
-                var idx = name.IndexOf('#');
-                if (idx >= 0)
+                if (name.Contains('#'))
                 {
                     if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
                         !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))
diff --git a/src/Commands/Blame.cs b/src/Commands/Blame.cs
index 4fa8b317..1fc51fa4 100644
--- a/src/Commands/Blame.cs
+++ b/src/Commands/Blame.cs
@@ -51,7 +51,7 @@ namespace SourceGit.Commands
 
         private void ParseLine(string line)
         {
-            if (line.IndexOf('\0', StringComparison.Ordinal) >= 0)
+            if (line.Contains('\0', StringComparison.Ordinal))
             {
                 _result.IsBinary = true;
                 _result.LineInfos.Clear();
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index 9bfa1c15..975922fc 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -194,7 +194,7 @@ namespace SourceGit.Commands
 
         private void HandleOutput(string line, List<string> errs)
         {
-            line = line ?? string.Empty;
+            line ??= string.Empty;
             Log?.AppendLine(line);
 
             // Lines to hide in error message.
diff --git a/src/Commands/Commit.cs b/src/Commands/Commit.cs
index 17410bc9..1585e7e3 100644
--- a/src/Commands/Commit.cs
+++ b/src/Commands/Commit.cs
@@ -34,6 +34,6 @@ namespace SourceGit.Commands
             return succ;
         }
 
-        private string _tmpFile = string.Empty;
+        private readonly string _tmpFile;
     }
 }
diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs
index e621ed7d..18d2ba93 100644
--- a/src/Commands/LFS.cs
+++ b/src/Commands/LFS.cs
@@ -10,7 +10,7 @@ namespace SourceGit.Commands
         [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
         private static partial Regex REG_LOCK();
 
-        class SubCmd : Command
+        private class SubCmd : Command
         {
             public SubCmd(string repo, string args, Models.ICommandLog log)
             {
diff --git a/src/Commands/QueryCommitsForInteractiveRebase.cs b/src/Commands/QueryCommitsForInteractiveRebase.cs
index 615060a5..9f238319 100644
--- a/src/Commands/QueryCommitsForInteractiveRebase.cs
+++ b/src/Commands/QueryCommitsForInteractiveRebase.cs
@@ -90,6 +90,6 @@ namespace SourceGit.Commands
 
         private List<Models.InteractiveCommit> _commits = [];
         private Models.InteractiveCommit _current = null;
-        private string _boundary = "";
+        private readonly string _boundary;
     }
 }
diff --git a/src/Commands/QueryFileSize.cs b/src/Commands/QueryFileSize.cs
index 9016d826..30af7715 100644
--- a/src/Commands/QueryFileSize.cs
+++ b/src/Commands/QueryFileSize.cs
@@ -16,9 +16,6 @@ namespace SourceGit.Commands
 
         public long Result()
         {
-            if (_result != 0)
-                return _result;
-
             var rs = ReadToEnd();
             if (rs.IsSuccess)
             {
@@ -29,7 +26,5 @@ namespace SourceGit.Commands
 
             return 0;
         }
-
-        private readonly long _result = 0;
     }
 }
diff --git a/src/Commands/UnstageChangesForAmend.cs b/src/Commands/UnstageChangesForAmend.cs
index c930f136..19def067 100644
--- a/src/Commands/UnstageChangesForAmend.cs
+++ b/src/Commands/UnstageChangesForAmend.cs
@@ -23,13 +23,11 @@ namespace SourceGit.Commands
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.OriginalPath);
-                    _patchBuilder.Append("\n");
                 }
                 else if (c.Index == Models.ChangeState.Added)
                 {
                     _patchBuilder.Append("0 0000000000000000000000000000000000000000\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
                 else if (c.Index == Models.ChangeState.Deleted)
                 {
@@ -37,7 +35,6 @@ namespace SourceGit.Commands
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
                 else
                 {
@@ -46,8 +43,9 @@ namespace SourceGit.Commands
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
+
+                _patchBuilder.Append("\n");
             }
         }
 
diff --git a/src/Models/AvatarManager.cs b/src/Models/AvatarManager.cs
index 2edcb619..fa07975d 100644
--- a/src/Models/AvatarManager.cs
+++ b/src/Models/AvatarManager.cs
@@ -38,7 +38,7 @@ namespace SourceGit.Models
         [GeneratedRegex(@"^(?:(\d+)\+)?(.+?)@.+\.github\.com$")]
         private static partial Regex REG_GITHUB_USER_EMAIL();
 
-        private object _synclock = new object();
+        private readonly Lock _synclock = new();
         private string _storePath;
         private List<IAvatarHost> _avatars = new List<IAvatarHost>();
         private Dictionary<string, Bitmap> _resources = new Dictionary<string, Bitmap>();
@@ -144,8 +144,7 @@ namespace SourceGit.Models
                 if (_defaultAvatars.Contains(email))
                     return null;
 
-                if (_resources.ContainsKey(email))
-                    _resources.Remove(email);
+                _resources.Remove(email);
 
                 var localFile = Path.Combine(_storePath, GetEmailHash(email));
                 if (File.Exists(localFile))
@@ -179,8 +178,7 @@ namespace SourceGit.Models
 
             lock (_synclock)
             {
-                if (!_requesting.Contains(email))
-                    _requesting.Add(email);
+                _requesting.Add(email);
             }
 
             return null;
@@ -200,10 +198,7 @@ namespace SourceGit.Models
                 if (image == null)
                     return;
 
-                if (_resources.ContainsKey(email))
-                    _resources[email] = image;
-                else
-                    _resources.Add(email, image);
+                _resources[email] = image;
 
                 _requesting.Remove(email);
 
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index 9a7933c8..f0f4b39b 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -19,7 +19,7 @@ namespace SourceGit.Models
     public class Commit
     {
         // As retrieved by: git mktree </dev/null
-        public static readonly string EmptyTreeSHA1 = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
+        public const string EmptyTreeSHA1 = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 
         public static double OpacityForNotMerged
         {
diff --git a/src/Models/CommitTemplate.cs b/src/Models/CommitTemplate.cs
index 56e1992c..3f331543 100644
--- a/src/Models/CommitTemplate.cs
+++ b/src/Models/CommitTemplate.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.Models
 {
-    public partial class CommitTemplate : ObservableObject
+    public class CommitTemplate : ObservableObject
     {
         public string Name
         {
diff --git a/src/Models/NumericSort.cs b/src/Models/NumericSort.cs
index ed4e52b8..025c7ad0 100644
--- a/src/Models/NumericSort.cs
+++ b/src/Models/NumericSort.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 
 namespace SourceGit.Models
 {
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 3a864ffe..a54956d3 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -287,9 +287,8 @@ namespace SourceGit.Models
                 return false;
             }
 
-            for (int i = 0; i < HistoriesFilters.Count; i++)
+            foreach (var filter in HistoriesFilters)
             {
-                var filter = HistoriesFilters[i];
                 if (filter.Type != type)
                     continue;
 
diff --git a/src/Models/TemplateEngine.cs b/src/Models/TemplateEngine.cs
index 8472750c..c54f55fb 100644
--- a/src/Models/TemplateEngine.cs
+++ b/src/Models/TemplateEngine.cs
@@ -402,7 +402,7 @@ namespace SourceGit.Models
 
             sb.AppendJoin(", ", paths);
             if (max < context.changes.Count)
-                sb.AppendFormat(" and {0} other files", context.changes.Count - max);
+                sb.Append($" and {context.changes.Count - max} other files");
 
             return sb.ToString();
         }
diff --git a/src/Models/TextInlineChange.cs b/src/Models/TextInlineChange.cs
index c96d839f..46a5c1eb 100644
--- a/src/Models/TextInlineChange.cs
+++ b/src/Models/TextInlineChange.cs
@@ -9,7 +9,7 @@ namespace SourceGit.Models
         public int AddedStart { get; set; }
         public int AddedCount { get; set; }
 
-        class Chunk
+        private class Chunk
         {
             public int Hash;
             public bool Modified;
@@ -25,7 +25,7 @@ namespace SourceGit.Models
             }
         }
 
-        enum Edit
+        private enum Edit
         {
             None,
             DeletedRight,
@@ -34,7 +34,7 @@ namespace SourceGit.Models
             AddedLeft,
         }
 
-        class EditResult
+        private class EditResult
         {
             public Edit State;
             public int DeleteStart;
@@ -208,7 +208,7 @@ namespace SourceGit.Models
                 for (int j = -i; j <= i; j += 2)
                 {
                     var idx = j + half;
-                    int o, n;
+                    int o;
                     if (j == -i || (j != i && forward[idx - 1] < forward[idx + 1]))
                     {
                         o = forward[idx + 1];
@@ -220,7 +220,7 @@ namespace SourceGit.Models
                         rs.State = Edit.DeletedRight;
                     }
 
-                    n = o - j;
+                    var n = o - j;
 
                     var startX = o;
                     var startY = n;
@@ -258,7 +258,7 @@ namespace SourceGit.Models
                 for (int j = -i; j <= i; j += 2)
                 {
                     var idx = j + half;
-                    int o, n;
+                    int o;
                     if (j == -i || (j != i && reverse[idx + 1] <= reverse[idx - 1]))
                     {
                         o = reverse[idx + 1] - 1;
@@ -270,7 +270,7 @@ namespace SourceGit.Models
                         rs.State = Edit.AddedLeft;
                     }
 
-                    n = o - (j + delta);
+                    var n = o - (j + delta);
 
                     var endX = o;
                     var endY = n;
@@ -312,8 +312,7 @@ namespace SourceGit.Models
 
         private static void AddChunk(List<Chunk> chunks, Dictionary<string, int> hashes, string data, int start)
         {
-            int hash;
-            if (hashes.TryGetValue(data, out hash))
+            if (hashes.TryGetValue(data, out var hash))
             {
                 chunks.Add(new Chunk(hash, start, data.Length));
             }
diff --git a/src/Models/User.cs b/src/Models/User.cs
index 066ab747..0b4816fe 100644
--- a/src/Models/User.cs
+++ b/src/Models/User.cs
@@ -26,11 +26,7 @@ namespace SourceGit.Models
 
         public override bool Equals(object obj)
         {
-            if (obj == null || !(obj is User))
-                return false;
-
-            var other = obj as User;
-            return Name == other.Name && Email == other.Email;
+            return obj is User other && Name == other.Name && Email == other.Email;
         }
 
         public override int GetHashCode()
diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index ccdc645f..a3cfc329 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -246,7 +246,7 @@ namespace SourceGit.Models
         private long _updateStashes = 0;
         private long _updateTags = 0;
 
-        private object _lockSubmodule = new object();
+        private readonly Lock _lockSubmodule = new();
         private List<string> _submodules = new List<string>();
     }
 }
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index adca05f3..8042ac47 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -128,7 +128,7 @@ namespace SourceGit.Native
                 Microsoft.Win32.RegistryView.Registry64);
 
             var git = reg.OpenSubKey("SOFTWARE\\GitForWindows");
-            if (git != null && git.GetValue("InstallPath") is string installPath)
+            if (git?.GetValue("InstallPath") is string installPath)
             {
                 return Path.Combine(installPath, "bin", "git.exe");
             }
@@ -181,7 +181,7 @@ namespace SourceGit.Native
 
                     break;
                 case "cmd":
-                    return "C:\\Windows\\System32\\cmd.exe";
+                    return @"C:\Windows\System32\cmd.exe";
                 case "wt":
                     var wtFinder = new StringBuilder("wt.exe", 512);
                     if (PathFindOnPath(wtFinder, null))
@@ -199,8 +199,8 @@ namespace SourceGit.Native
             finder.VSCode(FindVSCode);
             finder.VSCodeInsiders(FindVSCodeInsiders);
             finder.VSCodium(FindVSCodium);
-            finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\Programs\\Fleet\\Fleet.exe");
-            finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\JetBrains\\Toolbox");
+            finder.Fleet(() => $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\Programs\Fleet\Fleet.exe");
+            finder.FindJetBrainsFromToolbox(() => $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\JetBrains\Toolbox");
             finder.SublimeText(FindSublimeText);
             finder.TryAdd("Visual Studio", "vs", FindVisualStudio, GenerateCommandlineArgsForVisualStudio);
             return finder.Founded;
diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/src/ViewModels/CheckoutAndFastForward.cs
index 8e62a452..97ab86d7 100644
--- a/src/ViewModels/CheckoutAndFastForward.cs
+++ b/src/ViewModels/CheckoutAndFastForward.cs
@@ -9,7 +9,7 @@ namespace SourceGit.ViewModels
             get;
         }
 
-        public Models.Branch RemoteBrach
+        public Models.Branch RemoteBranch
         {
             get;
         }
@@ -35,7 +35,7 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
             LocalBranch = localBranch;
-            RemoteBrach = remoteBranch;
+            RemoteBranch = remoteBranch;
         }
 
         public override Task<bool> Sure()
@@ -54,7 +54,7 @@ namespace SourceGit.ViewModels
 
                 if (DiscardLocalChanges)
                 {
-                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBrach.Head, true, true);
+                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBranch.Head, true, true);
                 }
                 else
                 {
@@ -72,7 +72,7 @@ namespace SourceGit.ViewModels
                         needPopStash = true;
                     }
 
-                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBrach.Head, false, true);
+                    succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBranch.Head, false, true);
                 }
 
                 if (succ)
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 3ec168db..fbecf30e 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -569,14 +569,14 @@ namespace SourceGit.ViewModels
 
                 if (!token.IsCancellationRequested)
                     Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Inlines = inlines });
-            });
+            }, token);
 
             Task.Run(() =>
             {
                 var signInfo = new Commands.QueryCommitSignInfo(_repo.FullPath, _commit.SHA, !_repo.HasAllowedSignersFile).Result();
                 if (!token.IsCancellationRequested)
                     Dispatcher.UIThread.Invoke(() => SignInfo = signInfo);
-            });
+            }, token);
 
             if (Preferences.Instance.ShowChildren)
             {
@@ -587,7 +587,7 @@ namespace SourceGit.ViewModels
                     var children = cmd.Result();
                     if (!token.IsCancellationRequested)
                         Dispatcher.UIThread.Post(() => Children = children);
-                });
+                }, token);
             }
 
             Task.Run(() =>
@@ -617,7 +617,7 @@ namespace SourceGit.ViewModels
                             SelectedChanges = null;
                     });
                 }
-            });
+            }, token);
         }
 
         private Models.InlineElementCollector ParseInlinesInMessage(string message)
diff --git a/src/ViewModels/ConfigureWorkspace.cs b/src/ViewModels/ConfigureWorkspace.cs
index ec885b2f..49cd649b 100644
--- a/src/ViewModels/ConfigureWorkspace.cs
+++ b/src/ViewModels/ConfigureWorkspace.cs
@@ -29,8 +29,7 @@ namespace SourceGit.ViewModels
 
         public ConfigureWorkspace()
         {
-            Workspaces = new AvaloniaList<Workspace>();
-            Workspaces.AddRange(Preferences.Instance.Workspaces);
+            Workspaces = new AvaloniaList<Workspace>(Preferences.Instance.Workspaces);
         }
 
         public void Add()
diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs
index 091a95a0..d3cd512b 100644
--- a/src/ViewModels/CreateTag.cs
+++ b/src/ViewModels/CreateTag.cs
@@ -65,8 +65,7 @@ namespace SourceGit.ViewModels
 
         public static ValidationResult ValidateTagName(string name, ValidationContext ctx)
         {
-            var creator = ctx.ObjectInstance as CreateTag;
-            if (creator != null)
+            if (ctx.ObjectInstance is CreateTag creator)
             {
                 var found = creator._repo.Tags.Find(x => x.Name == name);
                 if (found != null)
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index a1f71409..ed6d6c48 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -347,7 +347,7 @@ namespace SourceGit.ViewModels
                             log = _repo.CreateLog("Save as Patch");
 
                             var folder = picker[0];
-                            var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                            var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder.Path.ToString();
                             var succ = false;
                             for (var i = 0; i < selected.Count; i++)
                             {
@@ -707,7 +707,7 @@ namespace SourceGit.ViewModels
                         log = _repo.CreateLog("Save as Patch");
 
                         var folder = selected[0];
-                        var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString();
+                        var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder.Path.ToString();
                         var saveTo = GetPatchFileName(folderPath, commit);
                         var succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, commit.SHA, saveTo).Use(log).Exec());
                         if (succ)
diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
index 593b2a72..a1a87a42 100644
--- a/src/ViewModels/InProgressContexts.cs
+++ b/src/ViewModels/InProgressContexts.cs
@@ -4,7 +4,7 @@ namespace SourceGit.ViewModels
 {
     public abstract class InProgressContext
     {
-        public InProgressContext(string repo, string cmd)
+        protected InProgressContext(string repo, string cmd)
         {
             _repo = repo;
             _cmd = cmd;
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 7811014a..01e38e41 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -106,7 +106,7 @@ namespace SourceGit.ViewModels
             set
             {
                 if (SetProperty(ref _selectedItem, value))
-                    DetailContext.Commit = value != null ? value.Commit : null;
+                    DetailContext.Commit = value?.Commit;
             }
         }
 
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 187ff3aa..e6c55be2 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -298,15 +298,10 @@ namespace SourceGit.ViewModels
             if (removeIdx == activeIdx)
             {
                 ActivePage = Pages[removeIdx > 0 ? removeIdx - 1 : removeIdx + 1];
-                CloseRepositoryInTab(page);
-                Pages.RemoveAt(removeIdx);
-            }
-            else
-            {
-                CloseRepositoryInTab(page);
-                Pages.RemoveAt(removeIdx);
             }
 
+            CloseRepositoryInTab(page);
+            Pages.RemoveAt(removeIdx);
             GC.Collect();
         }
 
diff --git a/src/ViewModels/MergeMultiple.cs b/src/ViewModels/MergeMultiple.cs
index d9a3bd55..4522fb64 100644
--- a/src/ViewModels/MergeMultiple.cs
+++ b/src/ViewModels/MergeMultiple.cs
@@ -71,12 +71,10 @@ namespace SourceGit.ViewModels
                 }
                 else if (t is Models.Commit commit)
                 {
-                    var d = commit.Decorators.Find(x =>
-                    {
-                        return x.Type == Models.DecoratorType.LocalBranchHead ||
-                            x.Type == Models.DecoratorType.RemoteBranchHead ||
-                            x.Type == Models.DecoratorType.Tag;
-                    });
+                    var d = commit.Decorators.Find(x => x.Type is
+                        Models.DecoratorType.LocalBranchHead or
+                        Models.DecoratorType.RemoteBranchHead or
+                        Models.DecoratorType.Tag);
 
                     if (d != null)
                         ret.Add(d.Name);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index b97bbf5d..75c6b4ed 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -736,11 +736,8 @@ namespace SourceGit.ViewModels
             {
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
-                foreach (var url in urls)
+                foreach (var (name, addr) in urls)
                 {
-                    var name = url.Key;
-                    var addr = url.Value;
-
                     var item = new MenuItem();
                     item.Header = App.Text("Repository.Visit", name);
                     item.Icon = App.CreateMenuIcon("Icons.Remotes");
@@ -2468,7 +2465,7 @@ namespace SourceGit.ViewModels
         public ContextMenu CreateContextMenuForTagSortMode()
         {
             var mode = _settings.TagSortMode;
-            var changeMode = new Action<Models.TagSortMode>((m) =>
+            var changeMode = new Action<Models.TagSortMode>(m =>
             {
                 if (_settings.TagSortMode != m)
                 {
@@ -2746,10 +2743,7 @@ namespace SourceGit.ViewModels
         {
             foreach (var node in nodes)
             {
-                if (filters.TryGetValue(node.Path, out var value))
-                    node.FilterMode = value;
-                else
-                    node.FilterMode = Models.FilterMode.None;
+                node.FilterMode = filters.GetValueOrDefault(node.Path, Models.FilterMode.None);
 
                 if (!node.IsBranch)
                     UpdateBranchTreeFilterMode(node.Children, filters);
@@ -2760,10 +2754,7 @@ namespace SourceGit.ViewModels
         {
             foreach (var tag in _tags)
             {
-                if (filters.TryGetValue(tag.Name, out var value))
-                    tag.FilterMode = value;
-                else
-                    tag.FilterMode = Models.FilterMode.None;
+                tag.FilterMode = filters.GetValueOrDefault(tag.Name, Models.FilterMode.None);
             }
         }
 
@@ -2952,7 +2943,7 @@ namespace SourceGit.ViewModels
         private List<string> _matchedFilesForSearching = null;
 
         private string _filter = string.Empty;
-        private object _lockRemotes = new object();
+        private readonly Lock _lockRemotes = new();
         private List<Models.Remote> _remotes = new List<Models.Remote>();
         private List<Models.Branch> _branches = new List<Models.Branch>();
         private Models.Branch _currentBranch = null;
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 9ccbaccd..d69ff711 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -156,7 +156,7 @@ namespace SourceGit.ViewModels
             foreach (var service in Preferences.Instance.OpenAIServices)
                 AvailableOpenAIServices.Add(service.Name);
 
-            if (AvailableOpenAIServices.IndexOf(PreferredOpenAIService) == -1)
+            if (!AvailableOpenAIServices.Contains(PreferredOpenAIService))
                 PreferredOpenAIService = "---";
 
             _cached = new Commands.Config(repo.FullPath).ListAll();
diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index 21cd9bf8..4c7eec4b 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -128,14 +128,14 @@ namespace SourceGit.ViewModels
 
         private RepositoryNode FindOrCreateGroupRecursive(List<RepositoryNode> collection, string path)
         {
-            var idx = path.IndexOf('/');
-            if (idx < 0)
-                return FindOrCreateGroup(collection, path);
+            RepositoryNode node = null;
+            foreach (var name in path.Split('/'))
+            {
+                node = FindOrCreateGroup(collection, name);
+                collection = node.SubNodes;
+            }
 
-            var name = path.Substring(0, idx);
-            var tail = path.Substring(idx + 1);
-            var parent = FindOrCreateGroup(collection, name);
-            return FindOrCreateGroupRecursive(parent.SubNodes, tail);
+            return node;
         }
 
         private RepositoryNode FindOrCreateGroup(List<RepositoryNode> collection, string name)
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index e8baaeb4..9f4d007d 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -66,7 +66,7 @@
             <Grid Height="26" ColumnDefinitions="26,*,30">
               <Path Grid.Column="0" Width="14" Height="14" Margin="8,0,0,0" HorizontalAlignment="Center" Data="{StaticResource Icons.File}"/>
               <Border Grid.Column="1" Margin="4,0" ClipToBounds="True">
-                <TextBlock Grid.Column="1" Text="{Binding}" HorizontalAlignment="Left"/>
+                <TextBlock Text="{Binding}" HorizontalAlignment="Left"/>
               </Border>
               <Button Grid.Column="2" Classes="icon_button" Click="OnRemoveButtonClicked">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/Avatar.cs b/src/Views/Avatar.cs
index d8d8c564..dcb3591d 100644
--- a/src/Views/Avatar.cs
+++ b/src/Views/Avatar.cs
@@ -187,7 +187,7 @@ namespace SourceGit.Views
                 if (storageFile != null)
                 {
                     var saveTo = storageFile.Path.LocalPath;
-                    using (var writer = File.OpenWrite(saveTo))
+                    await using (var writer = File.OpenWrite(saveTo))
                     {
                         if (_img != null)
                         {
@@ -201,7 +201,7 @@ namespace SourceGit.Views
                             using (var rt = new RenderTargetBitmap(pixelSize, dpi))
                             using (var ctx = rt.CreateDrawingContext())
                             {
-                                this.Render(ctx);
+                                Render(ctx);
                                 rt.Save(writer);
                             }
                         }
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 6f299f8e..57a826a1 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -77,7 +77,7 @@
                        Margin="0,0,6,0"
                        Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
 
-            <TextBlock Grid.Column="2"
+            <TextBlock Grid.Column="1"
                        Text="{Binding Revision.Subject}"
                        TextTrimming="CharacterEllipsis"/>
           </Grid>          
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index 72dd605d..171d51d9 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -102,9 +102,8 @@ namespace SourceGit.Views
 
                         var info = _editor.BlameData.LineInfos[lineNumber - 1];
 
-                        if (calculated.Contains(info.CommitSHA))
+                        if (!calculated.Add(info.CommitSHA))
                             continue;
-                        calculated.Add(info.CommitSHA);
 
                         var x = 0.0;
                         var shaLink = new FormattedText(
diff --git a/src/Views/CheckoutAndFastForward.axaml b/src/Views/CheckoutAndFastForward.axaml
index 24ae7ab4..40ca3e14 100644
--- a/src/Views/CheckoutAndFastForward.axaml
+++ b/src/Views/CheckoutAndFastForward.axaml
@@ -47,7 +47,7 @@
                  Text="{DynamicResource Text.Checkout.WithFastForward.Upstream}"/>
       <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="4,0" Data="{StaticResource Icons.Branch}"/>
-        <TextBlock Text="{Binding RemoteBrach.FriendlyName}"/>
+        <TextBlock Text="{Binding RemoteBranch.FriendlyName}"/>
       </StackPanel>
 
       <TextBlock Grid.Row="2" Grid.Column="0"
diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml
index eb80be44..bf66864c 100644
--- a/src/Views/CherryPick.axaml
+++ b/src/Views/CherryPick.axaml
@@ -76,8 +76,7 @@
         <Border Grid.Column="1"
                 Background="Transparent"
                 ToolTip.Tip="{DynamicResource Text.CherryPick.Mainline.Tips}">
-          <Path Grid.Column="1"
-                Width="14" Height="14"
+          <Path Width="14" Height="14"
                 Data="{StaticResource Icons.Info}"/>
         </Border>
       </Grid>
diff --git a/src/Views/ColorPicker.cs b/src/Views/ColorPicker.cs
index 1f9ef3a5..5090af86 100644
--- a/src/Views/ColorPicker.cs
+++ b/src/Views/ColorPicker.cs
@@ -19,7 +19,7 @@ namespace SourceGit.Views
         }
 
         // Values are copied from Avalonia: src/Avalonia.Controls.ColorPicker/ColorPalettes/FluentColorPalette.cs
-        private static readonly Color[,] COLOR_TABLE = new Color[,]
+        private static readonly Color[,] COLOR_TABLE = new[,]
         {
             {
                 Color.FromArgb(255, 255,  67,  67), /* #FF4343 */
diff --git a/src/Views/CommandLogTime.cs b/src/Views/CommandLogTime.cs
index 2f24d890..665e6e7b 100644
--- a/src/Views/CommandLogTime.cs
+++ b/src/Views/CommandLogTime.cs
@@ -61,7 +61,7 @@ namespace SourceGit.Views
 
         private void StopTimer()
         {
-            if (_refreshTimer is { })
+            if (_refreshTimer is not null)
             {
                 _refreshTimer.Dispose();
                 _refreshTimer = null;
diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
index d7c7ee3f..61119991 100644
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@@ -264,8 +264,7 @@ namespace SourceGit.Views
                         if (currentParent is { DataContext: ViewModels.CommitDetail currentDetail } &&
                             currentDetail.Commit.SHA == lastDetailCommit)
                         {
-                            if (!_inlineCommits.ContainsKey(sha))
-                                _inlineCommits.Add(sha, c);
+                            _inlineCommits.TryAdd(sha, c);
 
                             // Make sure user still hovers the target SHA.
                             if (_lastHover == link && c != null)
diff --git a/src/Views/CommitStatusIndicator.cs b/src/Views/CommitStatusIndicator.cs
index c2f4184e..7073011a 100644
--- a/src/Views/CommitStatusIndicator.cs
+++ b/src/Views/CommitStatusIndicator.cs
@@ -35,7 +35,7 @@ namespace SourceGit.Views
             set => SetValue(BehindBrushProperty, value);
         }
 
-        enum Status
+        private enum Status
         {
             Normal,
             Ahead,
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index f0e001c8..3e7d5dc6 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -51,7 +51,7 @@ namespace SourceGit.Views
                 options.DefaultExtension = ".patch";
                 options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
 
-                var storageFile = await this.StorageProvider.SaveFilePickerAsync(options);
+                var storageFile = await StorageProvider.SaveFilePickerAsync(options);
                 if (storageFile != null)
                     await compare.SaveAsPatch(storageFile.Path.LocalPath);
 
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index d49d9735..18630e4c 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -141,7 +141,7 @@ namespace SourceGit.Views
                 if (DataContext is ViewModels.Histories)
                 {
                     var list = CommitListContainer;
-                    if (list != null && list.SelectedItems.Count == 1)
+                    if (list is { SelectedItems.Count: 1 })
                         list.ScrollIntoView(list.SelectedIndex);
                 }
             }
@@ -170,7 +170,7 @@ namespace SourceGit.Views
 
         private void OnCommitListContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems: { Count: > 0 } } list)
+            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems.Count: > 0 } list)
             {
                 var menu = histories.MakeContextMenu(list);
                 menu?.Open(list);
@@ -180,7 +180,7 @@ namespace SourceGit.Views
 
         private void OnCommitListDoubleTapped(object sender, TappedEventArgs e)
         {
-            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems: { Count: 1 } })
+            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems.Count: 1 })
             {
                 var source = e.Source as Control;
                 var item = source.FindAncestorOfType<ListBoxItem>();
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index a4dc19f4..5bab6d80 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -98,7 +98,6 @@ namespace SourceGit.Views
                     ctx.BeginFigure(new Point(x, y), true);
                     y = 1;
                     ctx.LineTo(new Point(x, y));
-                    x = drawRightX - 6;
                 }
                 else
                 {
@@ -112,9 +111,10 @@ namespace SourceGit.Views
                     x += 6;
                     y = 1;
                     ctx.ArcTo(new Point(x, y), new Size(6, 6), angle, false, SweepDirection.Clockwise);
-                    x = drawRightX - 6;
                 }
 
+                x = drawRightX - 6;
+
                 if (drawRightX <= LauncherTabsScroller.Bounds.Right)
                 {
                     ctx.LineTo(new Point(x, y));
diff --git a/src/Views/NameHighlightedTextBlock.cs b/src/Views/NameHighlightedTextBlock.cs
index 0d273106..89161e16 100644
--- a/src/Views/NameHighlightedTextBlock.cs
+++ b/src/Views/NameHighlightedTextBlock.cs
@@ -95,20 +95,15 @@ namespace SourceGit.Views
                     normalTypeface,
                     FontSize,
                     Foreground);
-
+                context.DrawText(formatted, new Point(offsetX, 0));
+                
                 if (isName)
                 {
                     var lineY = formatted.Baseline + 2;
-                    context.DrawText(formatted, new Point(offsetX, 0));
                     context.DrawLine(underlinePen, new Point(offsetX, lineY), new Point(offsetX + formatted.Width, lineY));
-                    offsetX += formatted.WidthIncludingTrailingWhitespace;
-                }
-                else
-                {
-                    context.DrawText(formatted, new Point(offsetX, 0));
-                    offsetX += formatted.WidthIncludingTrailingWhitespace;
                 }
 
+                offsetX += formatted.WidthIncludingTrailingWhitespace;
                 isName = !isName;
             }
         }
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 85de6a14..6856fbce 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -178,7 +178,7 @@ namespace SourceGit.Views
             SetIfChanged(config, "user.name", DefaultUser, "");
             SetIfChanged(config, "user.email", DefaultEmail, "");
             SetIfChanged(config, "user.signingkey", GPGUserKey, "");
-            SetIfChanged(config, "core.autocrlf", CRLFMode != null ? CRLFMode.Value : null, null);
+            SetIfChanged(config, "core.autocrlf", CRLFMode?.Value, null);
             SetIfChanged(config, "fetch.prune", EnablePruneOnFetch ? "true" : "false", "false");
             SetIfChanged(config, "commit.gpgsign", EnableGPGCommitSigning ? "true" : "false", "false");
             SetIfChanged(config, "tag.gpgsign", EnableGPGTagSigning ? "true" : "false", "false");
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 1c97162b..8196b72f 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -208,7 +208,7 @@ namespace SourceGit.Views
 
         private void OnWorktreeListPropertyChanged(object _, AvaloniaPropertyChangedEventArgs e)
         {
-            if (e.Property == ListBox.ItemsSourceProperty || e.Property == ListBox.IsVisibleProperty)
+            if (e.Property == ItemsControl.ItemsSourceProperty || e.Property == IsVisibleProperty)
                 UpdateLeftSidebarLayout();
         }
 
@@ -221,7 +221,7 @@ namespace SourceGit.Views
         private void UpdateLeftSidebarLayout()
         {
             var vm = DataContext as ViewModels.Repository;
-            if (vm == null || vm.Settings == null)
+            if (vm?.Settings == null)
                 return;
 
             if (!IsLoaded)
diff --git a/src/Views/Reset.axaml b/src/Views/Reset.axaml
index ce361b23..d95f003c 100644
--- a/src/Views/Reset.axaml
+++ b/src/Views/Reset.axaml
@@ -45,7 +45,7 @@
                 KeyDown="OnResetModeKeyDown">
         <ComboBox.ItemTemplate>
           <DataTemplate DataType="m:ResetMode">
-            <Grid ColumnDefinitions="16,60,*">
+            <Grid ColumnDefinitions="16,60,*,*">
               <Ellipse Grid.Column="0" Width="12" Height="12" Fill="{Binding Color}"/>
               <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="2,0,0,0"/>
               <TextBlock Grid.Column="2" Text="{Binding Desc}" Margin="2,0,16,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
index 98f32c25..569e121f 100644
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@@ -157,7 +157,7 @@ namespace SourceGit.Views
             else
             {
                 var vm = DataContext as ViewModels.CommitDetail;
-                if (vm == null || vm.Commit == null)
+                if (vm?.Commit == null)
                     return;
 
                 var objects = vm.GetRevisionFilesUnderFolder(file);
@@ -254,7 +254,7 @@ namespace SourceGit.Views
                 _searchResult.Clear();
 
                 var vm = DataContext as ViewModels.CommitDetail;
-                if (vm == null || vm.Commit == null)
+                if (vm?.Commit == null)
                 {
                     GC.Collect();
                     return;
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 999c3262..b6235ac8 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -765,12 +765,10 @@ namespace SourceGit.Views
             }
             else if (change.Property == BlockNavigationProperty)
             {
-                var oldValue = change.OldValue as ViewModels.BlockNavigation;
-                if (oldValue != null)
+                if (change.OldValue is ViewModels.BlockNavigation oldValue)
                     oldValue.PropertyChanged -= OnBlockNavigationPropertyChanged;
 
-                var newValue = change.NewValue as ViewModels.BlockNavigation;
-                if (newValue != null)
+                if (change.NewValue is ViewModels.BlockNavigation newValue)
                     newValue.PropertyChanged += OnBlockNavigationPropertyChanged;
 
                 TextArea?.TextView?.Redraw();
@@ -1251,8 +1249,7 @@ namespace SourceGit.Views
         {
             base.OnDataContextChanged(e);
 
-            var textDiff = DataContext as Models.TextDiff;
-            if (textDiff != null)
+            if (DataContext is Models.TextDiff textDiff)
             {
                 var builder = new StringBuilder();
                 foreach (var line in textDiff.Lines)
@@ -1410,8 +1407,7 @@ namespace SourceGit.Views
                 return;
             }
 
-            var textDiff = this.FindAncestorOfType<TextDiffView>()?.DataContext as Models.TextDiff;
-            if (textDiff != null)
+            if (this.FindAncestorOfType<TextDiffView>()?.DataContext is Models.TextDiff textDiff)
             {
                 var lineIdx = -1;
                 foreach (var line in view.VisualLines)
@@ -1537,7 +1533,7 @@ namespace SourceGit.Views
 
         private void DirectSyncScrollOffset()
         {
-            if (_scrollViewer is { } && DataContext is ViewModels.TwoSideTextDiff diff)
+            if (_scrollViewer is not null && DataContext is ViewModels.TwoSideTextDiff diff)
                 diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
         }
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index ab654d99..521e4530 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -215,16 +215,8 @@ namespace SourceGit.Views
                 if (to == null)
                     return;
 
-                if (to.IsRepository)
-                {
-                    e.DragEffects = DragDropEffects.None;
-                    e.Handled = true;
-                }
-                else
-                {
-                    e.DragEffects = DragDropEffects.Move;
-                    e.Handled = true;
-                }
+                e.DragEffects = to.IsRepository ? DragDropEffects.None : DragDropEffects.Move;
+                e.Handled = true;
             }
         }