diff --git a/include/AGraph.hpp b/include/AGraph.hpp
index 69045473..e2ada835 100644
--- a/include/AGraph.hpp
+++ b/include/AGraph.hpp
@@ -15,7 +15,7 @@ enum class GraphType { LINE, BAR, GAUGE };
 
 class AGraph : public AModule {
  public:
-  AGraph(const Json::Value &, const std::string &, const std::string &, uint16_t interval = 0,
+  AGraph(const Json::Value&, const std::string&, const std::string&, uint16_t interval = 0,
          bool enable_click = false, bool enable_scroll = false);
   virtual ~AGraph() = default;
   auto update() -> void override;
@@ -30,29 +30,28 @@ class AGraph : public AModule {
 
   const std::chrono::seconds interval_;
 
-  bool onDraw(const Cairo::RefPtr<Cairo::Context> &cr);
+  bool onDraw(const Cairo::RefPtr<Cairo::Context>& cr);
 
-  std::map<std::string, GtkMenuItem *> submenus_;
+  std::map<std::string, GtkMenuItem*> submenus_;
   std::map<std::string, std::string> menuActionsMap_;
-  static void handleGtkMenuEvent(GtkMenuItem *menuitem, gpointer data);
+  static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
 
  private:
-  void drawFilledArea(const Cairo::RefPtr<Cairo::Context> &cr,
-                      const std::vector<std::pair<double, double>> &points, double height,
-                      const Gdk::RGBA &bg_color);
+  void drawFilledArea(const Cairo::RefPtr<Cairo::Context>& cr,
+                      const std::vector<std::pair<double, double>>& points, double height,
+                      const Gdk::RGBA& bg_color);
 
-  void drawLine(const Cairo::RefPtr<Cairo::Context> &cr,
-                const std::vector<std::pair<double, double>> &points, const Gdk::RGBA &fg_color);
+  void drawLine(const Cairo::RefPtr<Cairo::Context>& cr,
+                const std::vector<std::pair<double, double>>& points, const Gdk::RGBA& fg_color);
 
-  void drawPath(const Cairo::RefPtr<Cairo::Context> &cr,
-                const std::vector<std::pair<double, double>> &points);
+  void drawPath(const Cairo::RefPtr<Cairo::Context>& cr,
+                const std::vector<std::pair<double, double>>& points);
 
-  void drawBars(const Cairo::RefPtr<Cairo::Context> &cr,
-                double width, double height, int current_value,
-                const Gdk::RGBA &fg_color);
+  void drawBars(const Cairo::RefPtr<Cairo::Context>& cr, double width, double height,
+                int current_value, const Gdk::RGBA& fg_color);
 
-  void drawGauge(const Cairo::RefPtr<Cairo::Context> &cr, double width, double height,
-                 int current_value, const Gdk::RGBA &fg_color);
+  void drawGauge(const Cairo::RefPtr<Cairo::Context>& cr, double width, double height,
+                 int current_value, const Gdk::RGBA& fg_color);
 };
 
 }  // namespace waybar
diff --git a/include/modules/cpu_graph.hpp b/include/modules/cpu_graph.hpp
index df5f6ea3..cf74a3fe 100644
--- a/include/modules/cpu_graph.hpp
+++ b/include/modules/cpu_graph.hpp
@@ -21,9 +21,9 @@ class CpuGraph : public AGraph {
   auto update() -> void override;
 
  private:
-  static constexpr const char *MODERATE_CLASS = "cpu-moderate";
-  static constexpr const char *HIGH_CLASS = "cpu-high";
-  static constexpr const char *INTENSIVE_CLASS = "cpu-intensive";
+  static constexpr const char* MODERATE_CLASS = "cpu-moderate";
+  static constexpr const char* HIGH_CLASS = "cpu-high";
+  static constexpr const char* INTENSIVE_CLASS = "cpu-intensive";
 
   std::vector<std::tuple<size_t, size_t>> prev_times_;
   util::SleeperThread thread_;
diff --git a/src/factory.cpp b/src/factory.cpp
index cd29554c..6969da6b 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -43,11 +43,11 @@
 #include "modules/niri/workspaces.hpp"
 #endif
 #ifdef HAVE_MANGO
-#include "modules/mango/language.hpp"
 #include "modules/mango/keymode.hpp"
+#include "modules/mango/language.hpp"
+#include "modules/mango/layout.hpp"
 #include "modules/mango/window.hpp"
 #include "modules/mango/workspaces.hpp"
-#include "modules/mango/layout.hpp"
 #endif
 #ifdef HAVE_WAYFIRE
 #include "modules/wayfire/window.hpp"
@@ -58,8 +58,8 @@
 #endif
 #if defined(HAVE_CPU_LINUX) || defined(HAVE_CPU_BSD)
 #include "modules/cpu.hpp"
-#include "modules/cpu_graph.hpp"
 #include "modules/cpu_frequency.hpp"
+#include "modules/cpu_graph.hpp"
 #include "modules/cpu_usage.hpp"
 #include "modules/load.hpp"
 #endif
diff --git a/src/modules/custom_graph.cpp b/src/modules/custom_graph.cpp
index c23ed0d6..2a12f0c1 100644
--- a/src/modules/custom_graph.cpp
+++ b/src/modules/custom_graph.cpp
@@ -5,7 +5,7 @@
 #include "util/scope_guard.hpp"
 
 waybar::modules::CustomGraph::CustomGraph(const std::string& name, const std::string& id,
-                                const Json::Value& config, const std::string& output_name)
+                                          const Json::Value& config, const std::string& output_name)
     : AGraph(config, "custom-graph-" + name, id),
       name_(name),
       output_name_(output_name),
@@ -175,9 +175,8 @@ auto waybar::modules::CustomGraph::update() -> void {
       if (tooltipEnabled()) {
         if (tooltip_format_enabled_) {
           auto tooltip = config_["tooltip-format"].asString();
-          tooltip = fmt::format(
-              fmt::runtime(tooltip), fmt::arg("text", text_), fmt::arg("alt", alt_),
-              fmt::arg("percentage", percentage_));
+          tooltip = fmt::format(fmt::runtime(tooltip), fmt::arg("text", text_),
+                                fmt::arg("alt", alt_), fmt::arg("percentage", percentage_));
           graph_.set_tooltip_markup(tooltip);
         } else {
           if (graph_.get_tooltip_markup() != tooltip_) {