diff --git a/include/window.hpp b/include/window.hpp
index da4af9a..1510091 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -12,18 +12,9 @@ namespace data {
 }
 
 namespace gui {
-    using modulesType = std::unordered_map<std::string, data::BasicData *>;
-    class Window;
-
-    [[nodiscard]] static std::optional<Window> create_window(
-        const GLFWerrorfun errorCallback,
-        GLFWframebuffersizefun framebufferCallback,
-        const bool debugOpengl,
-        GLFWwindow *shared,
-        std::initializer_list<modulesType::value_type> initializer) noexcept;
-
     class Window final {
     public:
+        using modulesType = std::unordered_map<std::string, data::BasicData *>;
         using windowPtr = GLFWwindow *;
 
     private:
@@ -60,7 +51,7 @@ namespace gui {
 
         Window(Window &&window) noexcept = default;
 
-        [[nodiscard]] friend std::optional<Window> create_window(
+        [[nodiscard]] static std::optional<Window> create_window(
             const GLFWerrorfun errorCallback,
             GLFWframebuffersizefun framebufferCallback,
             const bool debugOpengl,
diff --git a/src/window.cpp b/src/window.cpp
index c24f7c9..7d7d401 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -111,7 +111,7 @@ namespace gui {
         glfwMakeContextCurrent(wwindow.get());
     }
 
-    std::optional<Window> create_window(
+    std::optional<Window> Window::create_window(
         const GLFWerrorfun errorCallback,
         const GLFWframebuffersizefun framebufferCallback,
         const bool debugOpengl,