diff --git a/modules/renderer/src/gl/buffers.cpp b/modules/renderer/src/gl/buffers.cpp
index 98f3fee..2222357 100644
--- a/modules/renderer/src/gl/buffers.cpp
+++ b/modules/renderer/src/gl/buffers.cpp
@@ -7,7 +7,7 @@ namespace lt {
 
 //==================== CONSTANT_BUFFER ====================//
 glConstantBuffer::glConstantBuffer(ConstantBufferIndex index, unsigned int size)
-    : m_buffer_id(NULL)
+    : m_buffer_id()
     , m_index(static_cast<int>(index))
 {
 	glCreateBuffers(1, &m_buffer_id);
@@ -40,7 +40,7 @@ void glConstantBuffer::un_map()
 
 //==================== VERTEX_BUFFER ====================//
 glVertexBuffer::glVertexBuffer(float *vertices, unsigned int stride, unsigned int count)
-    : m_buffer_id(NULL)
+    : m_buffer_id()
 {
 	glCreateBuffers(1, &m_buffer_id);
 	glNamedBufferData(
@@ -63,7 +63,7 @@ void glVertexBuffer::bind()
 
 void glVertexBuffer::un_bind()
 {
-	glBindBuffer(GL_ARRAY_BUFFER, NULL);
+	glBindBuffer(GL_ARRAY_BUFFER, {});
 }
 
 auto glVertexBuffer::map() -> void *
@@ -78,7 +78,7 @@ void glVertexBuffer::un_map()
 //==================== VERTEX_BUFFER ====================//
 
 //==================== INDEX_BUFFER ====================//
-glIndexBuffer::glIndexBuffer(unsigned int *indices, unsigned int count): m_buffer_id(NULL)
+glIndexBuffer::glIndexBuffer(unsigned int *indices, unsigned int count): m_buffer_id()
 {
 	// generate indices if not provided
 	auto hasIndices = !!indices;
@@ -132,7 +132,7 @@ void glIndexBuffer::bind()
 
 void glIndexBuffer::un_bind()
 {
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, NULL);
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, {});
 }
 //==================== INDEX_BUFFER ====================//
 
diff --git a/modules/renderer/src/gl/framebuffers.cpp b/modules/renderer/src/gl/framebuffers.cpp
index 8bf495f..39ff6ea 100644
--- a/modules/renderer/src/gl/framebuffers.cpp
+++ b/modules/renderer/src/gl/framebuffers.cpp
@@ -6,9 +6,9 @@ namespace lt {
 
 glFramebuffer::glFramebuffer(const FramebufferSpecification &specification)
     : m_specification(specification)
-    , m_buffer_id(NULL)
-    , m_color_attachment_id(NULL)
-    , m_depth_stencil_attachment_id(NULL)
+    , m_buffer_id()
+    , m_color_attachment_id()
+    , m_depth_stencil_attachment_id()
 {
 	resize({ specification.width, specification.height });
 }
@@ -59,7 +59,7 @@ void glFramebuffer::resize(const glm::uvec2 &size)
 	    GL_RGBA8,
 	    m_specification.width,
 	    m_specification.height,
-	    NULL,
+	    {},
 	    GL_RGBA,
 	    GL_UNSIGNED_BYTE,
 	    nullptr
@@ -74,17 +74,6 @@ void glFramebuffer::resize(const glm::uvec2 &size)
 	    0
 	);
 
-	// glTextureStorage2D(m_color_attachment_id, 0, GL_RGBA8, m_specification.width,
-	// m_specification.height);
-
-	//	glCreateTextures(GL_TEXTURE_2D, 1, &m_depth_stencil_attachment_id);
-	//	glBindTexture(GL_TEXTURE_2D, m_depth_stencil_attachment_id);
-	//	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_specification.width,
-	// m_specification.height, NULL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
-	//	// glTextureStorage2D(m_depth_stencil_attachment_id, 0, GL_DEPTH24_STENCIL8,
-	// m_specification.width, m_specification.height); 	glFramebufferTexture2D(GL_FRAMEBUFFER,
-	// GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_depth_stencil_attachment_id, 0);
-
 	ensure(
 	    (glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE),
 	    "Framebuffer is incomplete"
diff --git a/modules/renderer/src/gl/render_command.cpp b/modules/renderer/src/gl/render_command.cpp
index e5a115f..6f762e4 100644
--- a/modules/renderer/src/gl/render_command.cpp
+++ b/modules/renderer/src/gl/render_command.cpp
@@ -33,7 +33,7 @@ void glRenderCommand::draw_indexed(unsigned int count)
 
 void glRenderCommand::default_target_framebuffer()
 {
-	glBindFramebuffer(GL_FRAMEBUFFER, NULL);
+	glBindFramebuffer(GL_FRAMEBUFFER, {});
 }
 
 void glRenderCommand::set_viewport(
diff --git a/modules/renderer/src/gl/shader.cpp b/modules/renderer/src/gl/shader.cpp
index 9859418..b2f12c8 100644
--- a/modules/renderer/src/gl/shader.cpp
+++ b/modules/renderer/src/gl/shader.cpp
@@ -56,7 +56,7 @@ void glShader::bind()
 
 void glShader::un_bind()
 {
-	glUseProgram(NULL);
+	glUseProgram({});
 }
 
 auto glShader::compile_shader(const std::string &source, Shader::Stage stage) -> unsigned int
@@ -67,7 +67,7 @@ auto glShader::compile_shader(const std::string &source, Shader::Stage stage) ->
 	    stage == Shader::Stage::vertex   ? GL_VERTEX_SHADER :
 	    stage == Shader::Stage::pixel    ? GL_FRAGMENT_SHADER :
 	    stage == Shader::Stage::geometry ? GL_GEOMETRY_SHADER :
-	                                       NULL
+	                                       0
 	);
 
 	// compile
@@ -91,7 +91,7 @@ auto glShader::compile_shader(const std::string &source, Shader::Stage stage) ->
 		    errorLog
 		);
 
-		return NULL;
+		return {};
 	}
 #define LIGHT_OPENGL_ENABLE_SHADER_INFO_LOG
 #ifdef LIGHT_OPENGL_ENABLE_SHADER_INFO_LOG
diff --git a/modules/renderer/src/gl/vertex_layout.cpp b/modules/renderer/src/gl/vertex_layout.cpp
index 2a18687..bedf2f1 100644
--- a/modules/renderer/src/gl/vertex_layout.cpp
+++ b/modules/renderer/src/gl/vertex_layout.cpp
@@ -9,7 +9,7 @@ glVertexLayout::glVertexLayout(
     const Ref<VertexBuffer> &buffer,
     const std::vector<std::pair<std::string, VertexElementType>> &elements
 )
-    : m_array_id(NULL)
+    : m_array_id()
 {
 	// check
 	ensure(
@@ -65,7 +65,7 @@ void glVertexLayout::bind()
 
 void glVertexLayout::un_bind()
 {
-	glBindVertexArray(NULL);
+	glBindVertexArray({});
 }
 
 auto glVertexLayout::get_element_desc(VertexElementType type, unsigned int offset)