diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp
index 2434074f6..bea880b27 100644
--- a/cockatrice/src/client/tapped_out_interface.cpp
+++ b/cockatrice/src/client/tapped_out_interface.cpp
@@ -1,7 +1,7 @@
 #include "tapped_out_interface.h"
 
-#include "deck_list_card_node.h"
 #include "deck_list.h"
+#include "deck_list_card_node.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>
diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h
index 247bee3a6..3fd60891d 100644
--- a/cockatrice/src/deck/deck_list_model.h
+++ b/cockatrice/src/deck/deck_list_model.h
@@ -3,8 +3,8 @@
 
 #include "../game/cards/exact_card.h"
 #include "abstract_deck_list_card_node.h"
-#include "deck_list_card_node.h"
 #include "deck_list.h"
+#include "deck_list_card_node.h"
 
 #include <QAbstractItemModel>
 #include <QList>
@@ -19,9 +19,9 @@ class QTextCursor;
  */
 enum DeckListModelGroupCriteria
 {
-    MAIN_TYPE,   /**< Group cards by their main type (e.g., creature, instant). */
-    MANA_COST,   /**< Group cards by their mana cost. */
-    COLOR        /**< Group cards by their color identity. */
+    MAIN_TYPE, /**< Group cards by their main type (e.g., creature, instant). */
+    MANA_COST, /**< Group cards by their mana cost. */
+    COLOR      /**< Group cards by their color identity. */
 };
 
 /**
@@ -236,10 +236,10 @@ public:
     void setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria);
 
 private:
-    DeckLoader *deckList; /**< Pointer to the deck loader providing the underlying data. */
+    DeckLoader *deckList;    /**< Pointer to the deck loader providing the underlying data. */
     InnerDecklistNode *root; /**< Root node of the model tree. */
     DeckListModelGroupCriteria activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE;
-    int lastKnownColumn; /**< Last column used for sorting. */
+    int lastKnownColumn;          /**< Last column used for sorting. */
     Qt::SortOrder lastKnownOrder; /**< Last known sort order. */
 
     InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
@@ -253,8 +253,7 @@ private:
 
     void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
 
-    template <typename T>
-    T getNode(const QModelIndex &index) const
+    template <typename T> T getNode(const QModelIndex &index) const
     {
         if (!index.isValid())
             return dynamic_cast<T>(root);
diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
index 33d21b4d5..8eea89a63 100644
--- a/cockatrice/src/deck/deck_loader.cpp
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -3,8 +3,8 @@
 #include "../game/cards/card_database.h"
 #include "../game/cards/card_database_manager.h"
 #include "../main.h"
-#include "deck_list_card_node.h"
 #include "deck_list.h"
+#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp
index 1b8fc1182..afc35e77a 100644
--- a/cockatrice/src/game/deckview/deck_view.cpp
+++ b/cockatrice/src/game/deckview/deck_view.cpp
@@ -3,8 +3,8 @@
 #include "../../client/ui/theme_manager.h"
 #include "../../game/cards/card_info.h"
 #include "../../settings/cache_settings.h"
-#include "deck_list_card_node.h"
 #include "deck_list.h"
+#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
diff --git a/common/abstract_deck_list_card_node.cpp b/common/abstract_deck_list_card_node.cpp
index a77edfe16..b8a497c20 100644
--- a/common/abstract_deck_list_card_node.cpp
+++ b/common/abstract_deck_list_card_node.cpp
@@ -34,8 +34,6 @@ bool AbstractDecklistCardNode::compareName(AbstractDecklistNode *other) const
     }
 }
 
-
-
 bool AbstractDecklistCardNode::readElement(QXmlStreamReader *xml)
 {
     while (!xml->atEnd()) {