diff --git a/include/factory.hpp b/include/factory.hpp
index 2ec3cf0f..e2548a9a 100644
--- a/include/factory.hpp
+++ b/include/factory.hpp
@@ -25,8 +25,8 @@
 #ifdef HAVE_HYPRLAND
 #include "modules/hyprland/backend.hpp"
 #include "modules/hyprland/language.hpp"
-#include "modules/hyprland/window.hpp"
 #include "modules/hyprland/submap.hpp"
+#include "modules/hyprland/window.hpp"
 #endif
 #if defined(__FreeBSD__) || (defined(__linux__) && !defined(NO_FILESYSTEM))
 #include "modules/battery.hpp"
diff --git a/include/modules/hyprland/submap.hpp b/include/modules/hyprland/submap.hpp
index e33cdae2..c36578cd 100644
--- a/include/modules/hyprland/submap.hpp
+++ b/include/modules/hyprland/submap.hpp
@@ -1,4 +1,5 @@
 #include <fmt/format.h>
+
 #include "ALabel.hpp"
 #include "bar.hpp"
 #include "modules/hyprland/backend.hpp"
diff --git a/include/modules/image.hpp b/include/modules/image.hpp
index 00b8393c..06b61eef 100644
--- a/include/modules/image.hpp
+++ b/include/modules/image.hpp
@@ -23,10 +23,10 @@ class Image : public AModule {
   void delayWorker();
   void handleEvent();
 
-  Gtk::Image  image_;
+  Gtk::Image image_;
   std::string path_;
-  int         size_;
-  int         interval_;
+  int size_;
+  int interval_;
 
   util::SleeperThread thread_;
 };
diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index f8c18915..b621b83b 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -131,7 +131,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
         // unnumbered workspaces behind numbered ones when computing the sort
         // attribute.
         //
-        // Note: if the 'alphabetical_sort' option is true, the user is in 
+        // Note: if the 'alphabetical_sort' option is true, the user is in
         // agreement that the "workspace prev/next" commands may not follow
         // the order displayed in Waybar.
         int max_num = -1;