1 files changed, 5 insertions, 18 deletions
diff --git a/src/libjin/render/window.h b/src/libjin/render/window.h
index 54fff47..0c2c79d 100644
--- a/src/libjin/render/window.h
+++ b/src/libjin/render/window.h
@@ -9,7 +9,7 @@ namespace jin
 namespace render
 {
 
-    class Window : public Subsystem
+    class Window : public Subsystem<Window>
     {
     public: 
 
@@ -25,11 +25,6 @@ namespace render
         
         SDL_GLContext getCtx(); 
         
-        static inline Window* get()
-        {
-            return (g_wnd ? g_wnd : (g_wnd = new Window()));
-        }
-
         inline int getW()
         {
             return width;
@@ -42,24 +37,16 @@ namespace render
 
         inline void swapBuffers();
 
-        bool init(const SettingBase* setting) override;
-        void quit() override;
+    private:
 
-    private: 
+        SDL_Window* wnd;
 
-        Window(); 
-        ~Window(); 
-        
-        static Window* g_wnd; 
-        
-        SDL_Window* wnd; 
-        
         SDL_GLContext ctx;
         
         int width, height;
 
-        onlyonce bool _init(const SettingBase* setting) override;
-        onlyonce void _quit() override;
+        onlyonce bool initSystem(const SettingBase* setting) override;
+        onlyonce void quitSystem() override;
     };
 
     typedef Window::Setting WindowSetting;