diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
index 2b307735d..39e5de491 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
@@ -37,7 +37,8 @@ bool parseDeckUrl(const QString &url, ParsedDeckInfo &outInfo)
                                  .fullUrl = TAPPEDOUT_BASE + slug + TAPPEDOUT_SUFFIX,
                                  .provider = DeckProvider::TappedOut};
         return true;
-    } else if ((match = rxArchidekt.match(url)).hasMatch()) {
+    }
+    if ((match = rxArchidekt.match(url)).hasMatch()) {
         QString deckID = match.captured(1);
         outInfo = ParsedDeckInfo{.baseUrl = ARCHIDEKT_BASE,
                                  .deckID = deckID,
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index ae7fce06e..831e28241 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -251,7 +251,8 @@ bool ThemeManager::isDarkMode(const QString &themeDirPath) const
     const ThemeConfig themeConfig = loadColorSchemeConfig(themeDirPath, systemThemeDir);
     if (themeConfig.colorScheme.compare("Dark", Qt::CaseInsensitive) == 0) {
         return true;
-    } else if (themeConfig.colorScheme.compare("Light", Qt::CaseInsensitive) == 0) {
+    }
+    if (themeConfig.colorScheme.compare("Light", Qt::CaseInsensitive) == 0) {
         return false;
     } else {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index df2a645f1..888c3437d 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -180,7 +180,8 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
                 dragButton->setCursor(Qt::ClosedHandCursor);
             }
             return false;
-        } else if (event->type() == QEvent::MouseMove) {
+        }
+        if (event->type() == QEvent::MouseMove) {
             auto *mouseEvent = static_cast<QMouseEvent *>(event);
             if (mouseEvent->buttons() & Qt::LeftButton) {
                 QPoint currentPos = mouseEvent->globalPosition().toPoint();
@@ -207,7 +208,8 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
             resizeStartHeight = currentHeight;
             resizeHandle->grabMouse();
             return true;
-        } else if (event->type() == QEvent::MouseMove && isResizing) {
+        }
+        if (event->type() == QEvent::MouseMove && isResizing) {
             auto *mouseEvent = static_cast<QMouseEvent *>(event);
             int deltaY = mouseEvent->globalPosition().y() - resizeStartY;
             int newHeight = resizeStartHeight + deltaY;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
index 979a4519c..cd13ebe76 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@@ -72,7 +72,8 @@ void DlgEditPassword::actOk()
     if (newPasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;
-    } else if (newPasswordEdit->text() != newPasswordEdit2->text()) {
+    }
+    if (newPasswordEdit->text() != newPasswordEdit2->text()) {
         QMessageBox::warning(this, tr("Error"), tr("The new passwords don't match."));
         return;
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
index ca42fbf40..fa0c295b7 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@@ -133,7 +133,8 @@ void DlgForgotPasswordReset::actOk()
     if (newpasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;
-    } else if (newpasswordEdit->text() != newpasswordverifyEdit->text()) {
+    }
+    if (newpasswordEdit->text() != newpasswordverifyEdit->text()) {
         QMessageBox::critical(this, tr("Reset Password Error"), tr("The passwords do not match."));
         return;
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 0b6a9585d..a87587de6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -521,7 +521,8 @@ void DlgRegister::actOk()
     if (passwordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Registration Warning"), tr("Your password is too short."));
         return;
-    } else if (passwordEdit->text() != passwordConfirmationEdit->text()) {
+    }
+    if (passwordEdit->text() != passwordConfirmationEdit->text()) {
         QMessageBox::critical(this, tr("Registration Warning"), tr("Your passwords do not match, please try again."));
         return;
     } else if (emailConfirmationEdit->text() != emailEdit->text()) {
diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
index 3463fe6df..53684a0a9 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
@@ -33,7 +33,8 @@ TipsOfTheDay::TipsOfTheDay(QString xmlPath, QObject *parent) : QAbstractListMode
     if (!QFile::exists(xmlPath)) {
         errorStream << tr("File does not exist.\n");
         return;
-    } else if (!xmlFile.open(QIODevice::ReadOnly)) {
+    }
+    if (!xmlFile.open(QIODevice::ReadOnly)) {
         errorStream << tr("Failed to open file.\n");
         return;
     }
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
index 7f25ea1f4..6027ee7ce 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -172,7 +172,8 @@ static QString zoneLogName(const QString &zone)
 {
     if (zone == DECK_ZONE_MAIN) {
         return "mainboard";
-    } else if (zone == DECK_ZONE_SIDE) {
+    }
+    if (zone == DECK_ZONE_SIDE) {
         return "sideboard";
     } else if (zone == DECK_ZONE_TOKENS) {
         return "tokens";
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
index f61293013..54d9e5a97 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -121,7 +121,8 @@ void UserContextMenu::gamesOfUserReceived(const Response &resp, const CommandCon
     if (resp.response_code() == Response::RespNameNotFound) {
         QMessageBox::critical(static_cast<QWidget *>(parent()), tr("Error"), tr("This user does not exist."));
         return;
-    } else if (resp.response_code() == Response::RespInIgnoreList) {
+    }
+    if (resp.response_code() == Response::RespInIgnoreList) {
         QMessageBox::critical(
             static_cast<QWidget *>(parent()), tr("Error"),
             tr("You are being ignored by %1 and can't see their games.").arg(QString::fromStdString(cmd.user_name())));
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
index b7f4614c9..cbab98848 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -296,7 +296,8 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const
         if (lhsUserLevelFlags.testFlag(userLevelEntry) &&
             lhsUserLevelFlags.testFlag(userLevelEntry) == rhsUserLevelFlags.testFlag(userLevelEntry)) {
             return collator.compare(data(2, Qt::UserRole).toString(), other.data(2, Qt::UserRole).toString()) < 0;
-        } else if (lhsUserLevelFlags.testFlag(userLevelEntry) != rhsUserLevelFlags.testFlag(userLevelEntry)) {
+        }
+        if (lhsUserLevelFlags.testFlag(userLevelEntry) != rhsUserLevelFlags.testFlag(userLevelEntry)) {
             return lhsUserLevelFlags.testFlag(userLevelEntry) > rhsUserLevelFlags.testFlag(userLevelEntry);
         }
     }
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index 1e80b2715..85ab62191 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -621,7 +621,8 @@ bool AbstractTabDeckEditor::confirmClose()
         int ret = createSaveConfirmationWindow()->exec();
         if (ret == QMessageBox::Save) {
             return actSaveDeck();
-        } else if (ret == QMessageBox::Cancel) {
+        }
+        if (ret == QMessageBox::Cancel) {
             return false;
         }
     }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index 1973a0747..ce42d40e1 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -360,7 +360,8 @@ void TabRoom::sendMessage()
     }
     if (sayEdit->text().isEmpty()) {
         return;
-    } else if (sayEdit->hasVisibleCompleterPopup()) {
+    }
+    if (sayEdit->hasVisibleCompleterPopup()) {
         sayEdit->hideCompleterPopups();
         return;
     } else {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index c5cb7fda6..1881e6444 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -1447,9 +1447,10 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
                 !userLevel.testFlag(ServerInfo_User::IsRegistered)) {
                 // Flags are additive, so reg/mod/admin are all IsRegistered
                 return;
-            } else if (SettingsCache::instance().chat().getIgnoreNonBuddyUserMessages() &&
-                       !userListManager->isUserBuddy(senderName) && !userLevel.testFlag(ServerInfo_User::IsModerator) &&
-                       !userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+            }
+            if (SettingsCache::instance().chat().getIgnoreNonBuddyUserMessages() &&
+                !userListManager->isUserBuddy(senderName) && !userLevel.testFlag(ServerInfo_User::IsModerator) &&
+                !userLevel.testFlag(ServerInfo_User::IsAdmin)) {
                 // Ignore private messages from non-buddies
                 // Moderator/Admin messages are exempt to ensure warnings reach users
                 return;
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index 84bf026f7..c9fb0adec 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -265,7 +265,8 @@ static QString zoneForClickModifiers(const Qt::KeyboardModifiers &modifiers)
 {
     if (modifiers.testFlag(Qt::ControlModifier)) {
         return DECK_ZONE_SIDE;
-    } else if (modifiers.testFlag(Qt::ShiftModifier)) {
+    }
+    if (modifiers.testFlag(Qt::ShiftModifier)) {
         return DECK_ZONE_MAYBEBOARD;
     } else {
         return DECK_ZONE_MAIN;
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
index d0800e596..62ec2af3b 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
@@ -57,7 +57,8 @@ QVariant CardInfoComparator::getProperty(const CardInfoPtr &card, const QString
     // Check if the property exists in the main fields of the class
     if (property == "name") {
         return card->getName();
-    } else if (property == "text") {
+    }
+    if (property == "text") {
         return card->getText();
     } else if (property == "isToken") {
         return card->getIsToken();
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
index c4faf1c4c..f7940af53 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
@@ -154,7 +154,8 @@ void CardSetList::defaultSort()
         // Sort by priority, then by release date, then by short name
         if (a->getPriority() != b->getPriority()) {
             return a->getPriority() < b->getPriority(); // lowest first
-        } else if (a->getReleaseDate() != b->getReleaseDate()) {
+        }
+        if (a->getReleaseDate() != b->getReleaseDate()) {
             return a->getReleaseDate() > b->getReleaseDate(); // most recent first
         } else {
             return a->getShortName() < b->getShortName(); // alphabetically
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
index b7b1e0b8f..b20427e19 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
@@ -36,7 +36,8 @@ QString InnerDecklistNode::visibleNameFromName(const QString &_name)
 {
     if (_name == DECK_ZONE_MAIN) {
         return QObject::tr("Maindeck");
-    } else if (_name == DECK_ZONE_SIDE) {
+    }
+    if (_name == DECK_ZONE_SIDE) {
         return QObject::tr("Sideboard");
     } else if (_name == DECK_ZONE_TOKENS) {
         return QObject::tr("Tokens");
diff --git a/libcockatrice_game/libcockatrice/game/abstract_game.cpp b/libcockatrice_game/libcockatrice/game/abstract_game.cpp
index a93f44018..550a202e3 100644
--- a/libcockatrice_game/libcockatrice/game/abstract_game.cpp
+++ b/libcockatrice_game/libcockatrice/game/abstract_game.cpp
@@ -33,7 +33,8 @@ AbstractClient *AbstractGame::getClientForPlayer(int playerId) const
         }
 
         return gameState->getClients().at(playerId);
-    } else if (gameState->getClients().isEmpty()) {
+    }
+    if (gameState->getClients().isEmpty()) {
         return nullptr;
     } else {
         return gameState->getClients().first();
diff --git a/libcockatrice_game/libcockatrice/game/player/player_logic.cpp b/libcockatrice_game/libcockatrice/game/player/player_logic.cpp
index 96bd07164..ef9e3cda8 100644
--- a/libcockatrice_game/libcockatrice/game/player/player_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/player/player_logic.cpp
@@ -254,7 +254,8 @@ void PlayerLogic::deleteCard(CardState *card)
 {
     if (card == nullptr) {
         return;
-    } else if (dialogSemaphore) {
+    }
+    if (dialogSemaphore) {
         cardsToDelete.append(card);
     } else {
         card->deleteView();
diff --git a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
index a160dcc1d..b92d5f318 100644
--- a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
@@ -194,7 +194,8 @@ QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) cons
     QString ownerName = player->getPlayerInfo()->getName();
     if (name == ZoneNames::HAND) {
         return (theirOwn ? tr("their hand", "nominative") : tr("%1's hand", "nominative").arg(ownerName));
-    } else if (name == ZoneNames::DECK) {
+    }
+    if (name == ZoneNames::DECK) {
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their library", "look at zone")
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
index 9ec0afd9c..a2ae14a06 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -128,7 +128,8 @@ int CardDatabaseDisplayModel::lessThanNumerically(QStringView left, QStringView
     if (okLeft && okRight) {
         if (leftNum < rightNum) {
             return -1;
-        } else if (leftNum > rightNum) {
+        }
+        if (leftNum > rightNum) {
             return 1;
         } else {
             return 0;
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 85d1cdddc..2a58399e6 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -57,7 +57,8 @@ double Expression::eval(const peg::Ast &ast)
     const auto &nodes = ast.nodes;
     if (ast.name == "NUMBER") {
         return stod(std::string(ast.token));
-    } else if (ast.name == "FUNCTION") {
+    }
+    if (ast.name == "FUNCTION") {
         QString name = QString::fromStdString(std::string(nodes[0]->token));
         if (!fns.contains(name)) {
             return 0;