diff --git a/WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs b/WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs
index 3b02a3f08ce..50f649a63d9 100644
--- a/WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs
+++ b/WalletWasabi.Gui/Tabs/WalletManager/WalletManagerViewModel.cs
@@ -148,15 +148,14 @@ private async Task RefreshHardwareWalletListAsync()
 								LoadWalletViewModelHardware.SetWarningMessage("Log into your Bitcoin account on your Ledger. If you're already logged in, log out and log in again.");
 								continue;
 							}
-							else if (hwis.Any(x => x.Type == HardwareWalletType.Ledger && x.Ready))
+
+							if (hwis.Any(x => x.Type == HardwareWalletType.Ledger && x.Ready))
 							{
 								LoadWalletViewModelHardware.SetWarningMessage("To have a smooth user experience consider turning off your Ledger screensaver.");
-								break;
-							}
-							else
-							{
-								break;
 							}
+
+							break;
+
 							//foreach (var hwi in hwis)
 							//{
 							//	// https://github.com/zkSNACKs/WalletWasabi/issues/1344#issuecomment-484607454
diff --git a/WalletWasabi/Mono/CommandSet.cs b/WalletWasabi/Mono/CommandSet.cs
index 3ab635967bf..a08366abd4a 100644
--- a/WalletWasabi/Mono/CommandSet.cs
+++ b/WalletWasabi/Mono/CommandSet.cs
@@ -1,4 +1,4 @@
-//
+//
 // Options.cs
 //
 // Authors:
@@ -403,7 +403,7 @@ private static void ExtractToken(ref string input, out string rest)
 					continue;
 				}
 
-				for (int j = i; j < top; j++)
+				for (int j = i + 1; j < top; j++)
 				{
 					if (char.IsWhiteSpace(input[j]))
 					{
diff --git a/WalletWasabi/Services/UtxoReferee.cs b/WalletWasabi/Services/UtxoReferee.cs
index d602157557b..414503c7573 100644
--- a/WalletWasabi/Services/UtxoReferee.cs
+++ b/WalletWasabi/Services/UtxoReferee.cs
@@ -104,11 +104,7 @@ public async Task BanUtxosAsync(int severity, DateTimeOffset timeOfBan, bool for
 				}
 
 				var isNoted = true;
-				if (forceNoted)
-				{
-					isNoted = true;
-				}
-				else
+				if (!forceNoted)
 				{
 					if (RoundConfig.DosNoteBeforeBan.Value)
 					{