diff --git a/src/app/gfx/snes_color.cc b/src/app/gfx/snes_color.cc
index 8ca2e58e..221477d7 100644
--- a/src/app/gfx/snes_color.cc
+++ b/src/app/gfx/snes_color.cc
@@ -39,9 +39,9 @@ uint16_t ConvertRgbToSnes(const snes_color& color) {
 
 uint16_t ConvertRgbToSnes(const ImVec4& color) {
   snes_color new_color;
-  new_color.red = static_cast<uint8_t>(color.x) * kColorByteMax;
-  new_color.green = static_cast<uint8_t>(color.y) * kColorByteMax;
-  new_color.blue = static_cast<uint8_t>(color.z) * kColorByteMax;
+  new_color.red = color.x * kColorByteMax;
+  new_color.green = color.y * kColorByteMax;
+  new_color.blue = color.z * kColorByteMax;
   return ConvertRgbToSnes(new_color);
 }
 
diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h
index 118221ac..cafa928c 100644
--- a/src/app/gfx/snes_color.h
+++ b/src/app/gfx/snes_color.h
@@ -42,9 +42,9 @@ class SnesColor {
 
   explicit SnesColor(const ImVec4 val) : rgb_(val) {
     snes_color color;
-    color.red = static_cast<uint8_t>(val.x) / kColorByteMax;
-    color.green = static_cast<uint8_t>(val.y) / kColorByteMax;
-    color.blue = static_cast<uint8_t>(val.z) / kColorByteMax;
+    color.red = val.x / kColorByteMax;
+    color.green = val.y / kColorByteMax;
+    color.blue = val.z / kColorByteMax;
     snes_ = ConvertRgbToSnes(color);
   }
 
diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc
index 22f86053..be47f0b1 100644
--- a/src/app/gfx/snes_palette.cc
+++ b/src/app/gfx/snes_palette.cc
@@ -14,8 +14,7 @@
 #include "imgui/imgui.h"
 #include "util/macro.h"
 
-namespace yaze {
-namespace gfx {
+namespace yaze::gfx {
 
 SnesPalette::SnesPalette(char *data) {
   assert((sizeof(data) % 4 == 0) && (sizeof(data) <= 32));
@@ -359,5 +358,4 @@ absl::Status LoadAllPalettes(const std::vector<uint8_t> &rom_data,
 
 std::unordered_map<uint8_t, gfx::Paletteset> GfxContext::palettesets_;
 
-}  // namespace gfx
-}  // namespace yaze
+}  // namespace yaze::gfx
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index becb2ab6..fc3bd627 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -395,10 +395,11 @@ struct Paletteset {
    * @param spr2 The second sprite palette.
    * @param comp The composite palette.
    */
-  Paletteset(gfx::SnesPalette main, gfx::SnesPalette animated,
-             gfx::SnesPalette aux1, gfx::SnesPalette aux2,
-             gfx::SnesColor background, gfx::SnesPalette hud,
-             gfx::SnesPalette spr, gfx::SnesPalette spr2, gfx::SnesPalette comp)
+  Paletteset(const gfx::SnesPalette& main, const gfx::SnesPalette& animated,
+             const gfx::SnesPalette& aux1, const gfx::SnesPalette& aux2,
+             const gfx::SnesColor& background, const gfx::SnesPalette& hud,
+             const gfx::SnesPalette& spr, const gfx::SnesPalette& spr2,
+             const gfx::SnesPalette& comp)
       : main_(main),
         animated(animated),
         aux1(aux1),