diff --git a/src/app/zelda3/overworld/overworld.cc b/src/app/zelda3/overworld/overworld.cc
index 241a1552..a63c0288 100644
--- a/src/app/zelda3/overworld/overworld.cc
+++ b/src/app/zelda3/overworld/overworld.cc
@@ -495,8 +495,6 @@ absl::Status Overworld::LoadSpritesFromMap(int sprites_per_gamestate_ptr,
   return absl::OkStatus();
 }
 
-// ---------------------------------------------------------------------------
-
 absl::Status Overworld::Save(Rom &rom) {
   rom_ = rom;
   if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16Expanded())
diff --git a/src/app/zelda3/overworld/overworld.h b/src/app/zelda3/overworld/overworld.h
index bcb43d80..2ba5daaf 100644
--- a/src/app/zelda3/overworld/overworld.h
+++ b/src/app/zelda3/overworld/overworld.h
@@ -256,7 +256,6 @@ class Overworld : public SharedRom {
   std::vector<OverworldItem> all_items_;
   std::vector<std::vector<Sprite>> all_sprites_;
   std::vector<uint64_t> deleted_entrances_;
-
   std::vector<std::vector<uint8_t>> map_data_p1 =
       std::vector<std::vector<uint8_t>>(kNumOverworldMaps);
   std::vector<std::vector<uint8_t>> map_data_p2 =
@@ -264,7 +263,6 @@ class Overworld : public SharedRom {
 
   std::vector<int> map_pointers1_id = std::vector<int>(kNumOverworldMaps);
   std::vector<int> map_pointers2_id = std::vector<int>(kNumOverworldMaps);
-
   std::vector<int> map_pointers1 = std::vector<int>(kNumOverworldMaps);
   std::vector<int> map_pointers2 = std::vector<int>(kNumOverworldMaps);
 
diff --git a/src/app/zelda3/overworld/overworld_map.cc b/src/app/zelda3/overworld/overworld_map.cc
index c10f6cd1..7c0b3ce8 100644
--- a/src/app/zelda3/overworld/overworld_map.cc
+++ b/src/app/zelda3/overworld/overworld_map.cc
@@ -336,8 +336,6 @@ void OverworldMap::SetupCustomTileset(uint8_t asm_version) {
       rom_[OverworldCustomSubscreenOverlayArray + (index_ * 2)];
 }
 
-// ============================================================================
-
 void OverworldMap::LoadMainBlocksetId() {
   if (parent_ < 0x40) {
     main_gfx_id_ = 0x20;
diff --git a/src/app/zelda3/overworld/overworld_map.h b/src/app/zelda3/overworld/overworld_map.h
index 793820d2..9575bd68 100644
--- a/src/app/zelda3/overworld/overworld_map.h
+++ b/src/app/zelda3/overworld/overworld_map.h
@@ -168,7 +168,6 @@ class OverworldMap : public gfx::GfxContext {
   bool built_ = false;
   bool large_map_ = false;
   bool initialized_ = false;
-
   bool mosaic_ = false;
 
   int index_ = 0;        // Map index
diff --git a/src/app/zelda3/sprite/overlord.h b/src/app/zelda3/sprite/overlord.h
index cdab38f6..e559eccf 100644
--- a/src/app/zelda3/sprite/overlord.h
+++ b/src/app/zelda3/sprite/overlord.h
@@ -36,7 +36,6 @@ static const std::string kOverlordNames[] = {
 };
 
 }
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_ZELDA3_SPRITE_OVERLORD_H
diff --git a/src/app/zelda3/sprite/sprite.cc b/src/app/zelda3/sprite/sprite.cc
index d16e41f2..32c2d1ec 100644
--- a/src/app/zelda3/sprite/sprite.cc
+++ b/src/app/zelda3/sprite/sprite.cc
@@ -912,5 +912,4 @@ void Sprite::DrawSpriteTile(int x, int y, int srcx, int srcy, int pal,
 }
 
 }  // namespace zelda3
-
 }  // namespace yaze
diff --git a/src/app/zelda3/sprite/sprite.h b/src/app/zelda3/sprite/sprite.h
index bf906aa8..c0a8896b 100644
--- a/src/app/zelda3/sprite/sprite.h
+++ b/src/app/zelda3/sprite/sprite.h
@@ -390,7 +390,6 @@ class Sprite : public GameEntity {
 };
 
 }  // namespace zelda3
-
 }  // namespace yaze
 
 #endif
diff --git a/src/app/zelda3/sprite/sprite_builder.cc b/src/app/zelda3/sprite/sprite_builder.cc
index fe808b4b..c329fe8e 100644
--- a/src/app/zelda3/sprite/sprite_builder.cc
+++ b/src/app/zelda3/sprite/sprite_builder.cc
@@ -148,5 +148,4 @@ SpriteInstruction SpriteInstruction::JumpToFunction(
 }
 
 }  // namespace zelda3
-
 }  // namespace yaze
diff --git a/src/app/zelda3/sprite/sprite_builder.h b/src/app/zelda3/sprite/sprite_builder.h
index 2d7bcef5..d5ccc88d 100644
--- a/src/app/zelda3/sprite/sprite_builder.h
+++ b/src/app/zelda3/sprite/sprite_builder.h
@@ -124,7 +124,6 @@ class SpriteBuilder {
 };
 
 }  // namespace zelda3
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_ZELDA3_SPRITE_SPRITE_BUILDER_H_
\ No newline at end of file