diff --git a/src/app/editor/graphics/screen_editor.h b/src/app/editor/graphics/screen_editor.h
index 2299aec9..563ae40b 100644
--- a/src/app/editor/graphics/screen_editor.h
+++ b/src/app/editor/graphics/screen_editor.h
@@ -32,7 +32,7 @@ namespace editor {
  * The class inherits from the SharedRom class.
  */
 class ScreenEditor : public SharedRom, public Editor {
-public:
+ public:
   ScreenEditor() {
     screen_canvas_.SetCanvasSize(ImVec2(512, 512));
     type_ = EditorType::kScreen;
@@ -49,7 +49,7 @@ public:
 
   absl::Status SaveDungeonMaps();
 
-private:
+ private:
   void DrawTitleScreenEditor();
   void DrawNamingScreenEditor();
   void DrawOverworldMapEditor();
@@ -110,8 +110,7 @@ private:
   zelda3::screen::Inventory inventory_;
 };
 
-} // namespace editor
-
-} // namespace yaze
+}  // namespace editor
+}  // namespace yaze
 
 #endif
diff --git a/src/app/editor/overworld/overworld_editor.cc b/src/app/editor/overworld/overworld_editor.cc
index aa41d6f1..7cbf53e4 100644
--- a/src/app/editor/overworld/overworld_editor.cc
+++ b/src/app/editor/overworld/overworld_editor.cc
@@ -29,7 +29,6 @@ namespace yaze {
 namespace editor {
 
 using core::Renderer;
-
 using ImGui::BeginChild;
 using ImGui::BeginTabBar;
 using ImGui::BeginTabItem;
@@ -197,7 +196,6 @@ void OverworldEditor::DrawToolset() {
   }
 
   if (show_tile16_editor_) {
-    // Create a table in ImGui for the Tile16 Editor
     ImGui::Begin("Tile16 Editor", &show_tile16_editor_,
                  ImGuiWindowFlags_MenuBar);
     status_ = tile16_editor_.Update();
diff --git a/src/app/gui/color.h b/src/app/gui/color.h
index 38c4c814..34fae16a 100644
--- a/src/app/gui/color.h
+++ b/src/app/gui/color.h
@@ -4,10 +4,9 @@
 #include <format>
 #include <string>
 
-#include "imgui/imgui.h"
-
 #include "absl/status/status.h"
 #include "app/gfx/snes_palette.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace gui {
@@ -47,7 +46,7 @@ absl::Status DisplayPalette(gfx::SnesPalette &palette, bool loaded);
 void SelectablePalettePipeline(uint64_t &palette_id, bool &refresh_graphics,
                                gfx::SnesPalette &palette);
 
-} // namespace gui
-} // namespace yaze
+}  // namespace gui
+}  // namespace yaze
 
 #endif