diff --git a/14-refactor/src/main.cpp b/14-refactor/src/main.cpp
index a5e9e9b..323f733 100644
--- a/14-refactor/src/main.cpp
+++ b/14-refactor/src/main.cpp
@@ -92,12 +92,14 @@ Scene setup() {
 }
 
 void update(GLFWwindow* window, Scene& scene) {
+  glfwPollEvents();
   process_input(window, scene);
   scene.updateDelta();
 }
 
 void render(GLFWwindow* window, Scene& scene) {
   scene.render(window);
+  glfwSwapBuffers(window);
 }
 
 void quit(GLFWwindow* window, Scene& scene) {
diff --git a/14-refactor/src/scene.cpp b/14-refactor/src/scene.cpp
index afbfb7e..5988433 100644
--- a/14-refactor/src/scene.cpp
+++ b/14-refactor/src/scene.cpp
@@ -61,9 +61,6 @@ void Scene::render(GLFWwindow* window) {
   for(auto& position : positions) {
     draw_model(models[0], projection, view, position);
   }
-
-  glfwSwapBuffers(window);
-  glfwPollEvents();
 }
 
 void Scene::cleanup() {