diff --git a/src/Core/OpenGL/CShaderGenerator.cpp b/src/Core/OpenGL/CShaderGenerator.cpp
index d98677a2..6410581b 100644
--- a/src/Core/OpenGL/CShaderGenerator.cpp
+++ b/src/Core/OpenGL/CShaderGenerator.cpp
@@ -140,13 +140,9 @@ constexpr std::array gkTevRigid{
     "C2"sv,
 };
 
-CShaderGenerator::CShaderGenerator()
-{
-}
+CShaderGenerator::CShaderGenerator() = default;
 
-CShaderGenerator::~CShaderGenerator()
-{
-}
+CShaderGenerator::~CShaderGenerator() = default;
 
 bool CShaderGenerator::CreateVertexShader(const CMaterial& rkMat)
 {
diff --git a/src/Core/OpenGL/CShaderGenerator.h b/src/Core/OpenGL/CShaderGenerator.h
index 52c5c206..711dec3e 100644
--- a/src/Core/OpenGL/CShaderGenerator.h
+++ b/src/Core/OpenGL/CShaderGenerator.h
@@ -22,7 +22,7 @@
  */
 class CShaderGenerator
 {
-    CShader *mpShader;
+    CShader *mpShader = nullptr;
 
     CShaderGenerator();
     ~CShaderGenerator();