diff --git a/src/app/zelda3/screen/dungeon_map.cc b/src/app/zelda3/screen/dungeon_map.cc
index b2cac1ff..648929c0 100644
--- a/src/app/zelda3/screen/dungeon_map.cc
+++ b/src/app/zelda3/screen/dungeon_map.cc
@@ -10,7 +10,6 @@
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 absl::Status LoadDungeonMapGfxFromBinary(Rom &rom,
                                          std::array<gfx::Bitmap, 4> &sheets,
@@ -35,7 +34,8 @@ absl::Status LoadDungeonMapGfxFromBinary(Rom &rom,
         gfx_sheets.emplace_back(converted_bin.begin() + (i * 0x1000),
                                 converted_bin.begin() + ((i + 1) * 0x1000));
         sheets[i] = gfx::Bitmap(128, 32, 8, gfx_sheets[i]);
-        sheets[i].ApplyPalette(*rom.mutable_dungeon_palette(3));
+        RETURN_IF_ERROR(
+            sheets[i].ApplyPalette(*rom.mutable_dungeon_palette(3)));
         core::Renderer::GetInstance().RenderBitmap(&sheets[i]);
       }
     } else {
@@ -47,7 +47,5 @@ absl::Status LoadDungeonMapGfxFromBinary(Rom &rom,
   return absl::OkStatus();
 }
 
-} // namespace screen
 } // namespace zelda3
-
 } // namespace yaze
diff --git a/src/app/zelda3/screen/dungeon_map.h b/src/app/zelda3/screen/dungeon_map.h
index f8a73f38..507b147e 100644
--- a/src/app/zelda3/screen/dungeon_map.h
+++ b/src/app/zelda3/screen/dungeon_map.h
@@ -10,7 +10,6 @@
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 constexpr int kDungeonMapRoomsPtr = 0x57605;  // 14 pointers of map data
 constexpr int kDungeonMapFloors = 0x575D9;    // 14 words values
@@ -58,9 +57,7 @@ absl::Status LoadDungeonMapGfxFromBinary(Rom &rom,
                                          gfx::Tilesheet &tile16_sheet,
                                          std::vector<uint8_t> &gfx_bin_data);
 
-}  // namespace screen
 }  // namespace zelda3
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_ZELDA3_SCREEN_DUNGEON_MAP_H
diff --git a/src/app/zelda3/screen/inventory.cc b/src/app/zelda3/screen/inventory.cc
index caf4208c..44596c26 100644
--- a/src/app/zelda3/screen/inventory.cc
+++ b/src/app/zelda3/screen/inventory.cc
@@ -3,12 +3,10 @@
 #include "app/core/platform/renderer.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
-#include "app/gui/canvas.h"
 #include "app/rom.h"
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 using core::Renderer;
 
@@ -90,7 +88,5 @@ absl::Status Inventory::BuildTileset() {
   return absl::OkStatus();
 }
 
-}  // namespace screen
 }  // namespace zelda3
-
-}  // namespace yaze
\ No newline at end of file
+}  // namespace yaze
diff --git a/src/app/zelda3/screen/inventory.h b/src/app/zelda3/screen/inventory.h
index 9ca0ff0d..7515db9f 100644
--- a/src/app/zelda3/screen/inventory.h
+++ b/src/app/zelda3/screen/inventory.h
@@ -9,7 +9,6 @@
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 constexpr int kInventoryStart = 0x6564A;
 constexpr int kBowItemPos = 0x6F631;
@@ -37,9 +36,7 @@ class Inventory : public SharedRom {
   std::vector<gfx::TileInfo> tiles_;
 };
 
-}  // namespace screen
 }  // namespace zelda3
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_ZELDA3_INVENTORY_H
diff --git a/src/app/zelda3/screen/title_screen.cc b/src/app/zelda3/screen/title_screen.cc
index f0a06dee..fd92dba2 100644
--- a/src/app/zelda3/screen/title_screen.cc
+++ b/src/app/zelda3/screen/title_screen.cc
@@ -3,12 +3,10 @@
 #include <cstdint>
 
 #include "app/gfx/bitmap.h"
-#include "app/gfx/snes_tile.h"
 #include "app/rom.h"
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 void TitleScreen::Create() {
   tiles8Bitmap.Create(128, 512, 8, std::vector<uint8_t>(0x20000));
@@ -121,7 +119,5 @@ void TitleScreen::LoadTitleScreen() {
   pal_selected_ = 2;
 }
 
-}  // namespace screen
 }  // namespace zelda3
-
 }  // namespace yaze
diff --git a/src/app/zelda3/screen/title_screen.h b/src/app/zelda3/screen/title_screen.h
index 7b08d332..9b5c5193 100644
--- a/src/app/zelda3/screen/title_screen.h
+++ b/src/app/zelda3/screen/title_screen.h
@@ -1,16 +1,12 @@
 #ifndef YAZE_APP_ZELDA3_SCREEN_H
 #define YAZE_APP_ZELDA3_SCREEN_H
 
-#include <cstdint>
-
-
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "app/rom.h"
 
 namespace yaze {
 namespace zelda3 {
-namespace screen {
 
 class TitleScreen {
  public:
@@ -74,9 +70,7 @@ class TitleScreen {
   gfx::Bitmap tiles8Bitmap;    // 0x20000
 };
 
-}  // namespace screen
 }  // namespace zelda3
-
 }  // namespace yaze
 
 #endif  // YAZE_APP_ZELDA3_SCREEN_H