diff --git a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
index eee13d059..3cab65bf8 100644
--- a/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
+++ b/cockatrice/src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
@@ -38,7 +38,7 @@ EdhrecCommanderApiResponseDisplayWidget::EdhrecCommanderApiResponseDisplayWidget
 
     // Add card list widgets
     auto edhrec_commander_api_response_card_lists = response.container.getCardlists();
-    foreach (EdhrecCommanderApiResponseCardList card_list, edhrec_commander_api_response_card_lists) {
+    for (const EdhrecCommanderApiResponseCardList &card_list : edhrec_commander_api_response_card_lists) {
         auto cardListDisplayWidget = new EdhrecCommanderApiResponseCardListDisplayWidget(this, card_list);
         cardDisplayLayout->addWidget(cardListDisplayWidget);
         widgetNames.append(cardListDisplayWidget->getBannerText());
@@ -96,9 +96,7 @@ void EdhrecCommanderApiResponseDisplayWidget::resizeEvent(QResizeEvent *event)
     layout->invalidate();
     layout->activate();
     layout->update();
-    if (scrollArea) {
-        if (scrollArea->widget()) {
-            scrollArea->widget()->resize(event->size());
-        }
+    if (scrollArea && scrollArea->widget()) {
+        scrollArea->widget()->resize(event->size());
     }
 }
diff --git a/cockatrice/src/client/tabs/tab_deck_editor.cpp b/cockatrice/src/client/tabs/tab_deck_editor.cpp
index 605a9b038..8eee22cf5 100644
--- a/cockatrice/src/client/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/client/tabs/tab_deck_editor.cpp
@@ -51,6 +51,13 @@
 #include <QUrl>
 #include <QVBoxLayout>
 
+static bool canBeCommander(const CardInfoPtr &cardInfo)
+{
+    return ((cardInfo->getCardType().contains("Legendary", Qt::CaseInsensitive) &&
+             cardInfo->getCardType().contains("Creature", Qt::CaseInsensitive))) ||
+           cardInfo->getText().contains("can be your commander", Qt::CaseInsensitive);
+}
+
 void TabDeckEditor::createDeckDock()
 {
     deckModel = new DeckListModel(this);
@@ -546,9 +553,7 @@ void TabDeckEditor::databaseCustomMenu(QPoint point)
         addToDeck = menu.addAction(tr("Add to Deck"));
         addToSideboard = menu.addAction(tr("Add to Sideboard"));
         selectPrinting = menu.addAction(tr("Select Printing"));
-        if ((info->getCardType().contains("Legendary", Qt::CaseInsensitive) &&
-             info->getCardType().contains("Creature", Qt::CaseInsensitive)) ||
-            info->getText().contains("can be your commander", Qt::CaseInsensitive)) {
+        if (canBeCommander(info)) {
             edhRecCommander = menu.addAction(tr("Show on EDHREC (Commander)"));
             connect(edhRecCommander, &QAction::triggered, this,
                     [this, info] { this->tabSupervisor->addEdhrecTab(info, true); });
diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index 2f5c873a2..59651c9a5 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -716,13 +716,13 @@ TabDeckEditor *TabSupervisor::addDeckEditorTab(const DeckLoader *deckToOpen)
     return tab;
 }
 
-TabEdhRec *TabSupervisor::addEdhrecTab(const CardInfoPtr cardToQuery, bool isCommander)
+TabEdhRec *TabSupervisor::addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCommander)
 {
-    TabEdhRec *tab = new TabEdhRec(this);
-    if (cardToQuery)
+    auto *tab = new TabEdhRec(this);
+    if (cardToQuery) {
         tab->setCard(cardToQuery, isCommander);
-    // connect(tab, &TabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
-    // connect(tab, &TabDeckEditor::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
+    }
+
     myAddTab(tab);
     setCurrentWidget(tab);
     return tab;
diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h
index 98d53d683..ece58d43f 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.h
+++ b/cockatrice/src/client/tabs/tab_supervisor.h
@@ -148,7 +148,7 @@ signals:
 
 public slots:
     TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
-    TabEdhRec *addEdhrecTab(CardInfoPtr cardToQuery, bool isCommander = false);
+    TabEdhRec *addEdhrecTab(const CardInfoPtr& cardToQuery, bool isCommander = false);
     void openReplay(GameReplay *replay);
     void maximizeMainWindow();
 private slots:
diff --git a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
index 4e0a2aea7..51caf9bc1 100644
--- a/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
@@ -261,12 +261,11 @@ QMenu *CardInfoPictureWidget::createRightClickMenu()
     cardMenu->addMenu(viewRelatedCards);
     cardMenu->addMenu(addToOpenDeckMenu);
 
-    QWidget *topLevel = window();
-    auto *mainWindow = qobject_cast<MainWindow *>(topLevel);
+    auto *mainWindow = qobject_cast<MainWindow *>(window());
     QList<TabDeckEditor *> deckEditorTabs = mainWindow->getTabSupervisor()->getDeckEditorTabs();
 
     for (auto &deckEditorTab : deckEditorTabs) {
-        auto *addCardMenu = new QMenu("Add card to " + deckEditorTab->getTabText());
+        auto *addCardMenu = new QMenu(tr("Add card to") + " " + deckEditorTab->getTabText());
         QAction *addCard = new QAction(this);
         addCard->setText(tr("Mainboard"));
         connect(addCard, &QAction::triggered, this, [this, deckEditorTab] {