diff --git a/src/Model.cpp b/src/Model.cpp
index d0619a3..2705ece 100644
--- a/src/Model.cpp
+++ b/src/Model.cpp
@@ -21,7 +21,9 @@ Model::Model(std::vector<float>&& vertices, std::vector<unsigned int>&& indices)
 
 Model::~Model()
 {
-	
+	glDeleteBuffers(1, &ebo);
+	glDeleteBuffers(1, &vbo);
+	glDeleteVertexArrays(1, &vao);
 }
 
 void Model::Draw()
diff --git a/src/Model.hpp b/src/Model.hpp
index 0cdbb91..b347518 100644
--- a/src/Model.hpp
+++ b/src/Model.hpp
@@ -8,7 +8,7 @@ public:
 	Model();
 	Model(const std::vector<float>& vertices, const std::vector<unsigned int>& indices);
 	Model(std::vector<float>&& vertices, std::vector<unsigned int>&& indices);
-	~Model();
+	virtual ~Model();
 
 	void Draw();
 
diff --git a/src/Orbital.cpp b/src/Orbital.cpp
index 07ca5b0..c0fcbeb 100644
--- a/src/Orbital.cpp
+++ b/src/Orbital.cpp
@@ -13,6 +13,12 @@ unsigned int Fac(unsigned int n);
 
 Orbital::Orbital(unsigned int l, unsigned int m) :
 	l(l), m(m)
+{
+	UpdateModel();
+	CreateVAO();
+}
+
+void Orbital::UpdateModel()
 {
 	unsigned int verticesPerRing = 70;
 	unsigned int rings = 70;
@@ -59,8 +65,6 @@ Orbital::Orbital(unsigned int l, unsigned int m) :
 			indices.push_back(verticesPerRing * (ring + 1) + vertex);
 		}
 	}
-
-	CreateVAO();
 }
 
 void Orbital::DefineVAOLayout()
diff --git a/src/Orbital.hpp b/src/Orbital.hpp
index c62aa82..5c80c04 100644
--- a/src/Orbital.hpp
+++ b/src/Orbital.hpp
@@ -8,6 +8,7 @@ public:
 	Orbital(unsigned int l, unsigned int m);
 
 private:
+	void UpdateModel();
 	void DefineVAOLayout() final override;
 
 private:
diff --git a/src/Shader.cpp b/src/Shader.cpp
index 010d761..e495c2f 100644
--- a/src/Shader.cpp
+++ b/src/Shader.cpp
@@ -36,6 +36,11 @@ Shader::Shader(const std::string& vertexShaderSourceCode, const std::string& fra
 	CreateProgram(vertexShaderSourceCode, fragmentShaderSourceCode);
 }
 
+Shader::~Shader()
+{
+	glDeleteProgram(program);
+}
+
 void Shader::SetMatrix(const std::string& name, const float* data)
 {
 	unsigned int location = glGetUniformLocation(program, name.c_str());
diff --git a/src/Shader.hpp b/src/Shader.hpp
index 1a4dd5d..4dcb177 100644
--- a/src/Shader.hpp
+++ b/src/Shader.hpp
@@ -7,6 +7,7 @@ class Shader
 public:
 	Shader();
 	Shader(const std::string& vertexShaderSourceCode, const std::string& fragmentShaderSourceCode);
+	~Shader();
 	
 	void SetMatrix(const std::string& name, const float* data);