diff --git a/src/app/emu/emulator.cc b/src/app/emu/emulator.cc
index 617a06e4..cc0efbbc 100644
--- a/src/app/emu/emulator.cc
+++ b/src/app/emu/emulator.cc
@@ -49,7 +49,7 @@ using ImGui::Text;
 void Emulator::Run() {
   static bool loaded = false;
   if (!snes_.running() && rom()->is_loaded()) {
-    ppu_texture_ = SDL_CreateTexture(core::Renderer::GetInstance().renderer(),
+    ppu_texture_ = SDL_CreateTexture(core::Renderer::Get().renderer(),
                                      SDL_PIXELFORMAT_ARGB8888,
                                      SDL_TEXTUREACCESS_STREAMING, 512, 480);
     if (ppu_texture_ == NULL) {
diff --git a/src/ios/main.mm b/src/ios/main.mm
index c6be03f8..4711e663 100644
--- a/src/ios/main.mm
+++ b/src/ios/main.mm
@@ -87,8 +87,8 @@
   }
 
   ImGui_ImplSDL2_InitForSDLRenderer(_controller->window(),
-                                    yaze::core::Renderer::GetInstance().renderer());
-  ImGui_ImplSDLRenderer2_Init(yaze::core::Renderer::GetInstance().renderer());
+                                    yaze::core::Renderer::Get().renderer());
+  ImGui_ImplSDLRenderer2_Init(yaze::core::Renderer::Get().renderer());
 
   if (!LoadPackageFonts().ok()) {
     abort();
diff --git a/test/test_editor.cc b/test/test_editor.cc
index d144c4de..dcac0a59 100644
--- a/test/test_editor.cc
+++ b/test/test_editor.cc
@@ -64,8 +64,8 @@ int RunIntegrationTest() {
 
   // Initialize ImGui for SDL
   ImGui_ImplSDL2_InitForSDLRenderer(
-      controller.window(), yaze::core::Renderer::GetInstance().renderer());
-  ImGui_ImplSDLRenderer2_Init(yaze::core::Renderer::GetInstance().renderer());
+      controller.window(), yaze::core::Renderer::Get().renderer());
+  ImGui_ImplSDLRenderer2_Init(yaze::core::Renderer::Get().renderer());
 
   yaze::test::TestEditor test_editor;
   test_editor.RegisterTests(engine);
diff --git a/test/test_editor.h b/test/test_editor.h
index f68dfce4..338f9c8f 100644
--- a/test/test_editor.h
+++ b/test/test_editor.h
@@ -12,9 +12,7 @@ class TestEditor : public yaze::editor::Editor {
  public:
   TestEditor() = default;
   ~TestEditor() = default;
-  void Initialize() override {
-
-  }
+  void Initialize() override {}
 
   absl::Status Cut() override {
     return absl::UnimplementedError("Not implemented");