diff --git a/include/appTypes.h b/include/appTypes.h
index 38cbe9f..47789f0 100644
--- a/include/appTypes.h
+++ b/include/appTypes.h
@@ -249,6 +249,9 @@ void RenderComponents(App *app);
 void RenderGame(App *app);
 void CleanupGame(App *app);
 
+void OnEscapeChangeView(App *app, View view);
+void OnWindowClosedStoppApp(App *app);
+
 void ConfigApp(App *app);
 void InitApp(App *app);
 void UpdateApp(App *app);
diff --git a/src/appGame.c b/src/appGame.c
index 121fe11..eeb502e 100644
--- a/src/appGame.c
+++ b/src/appGame.c
@@ -1,12 +1,12 @@
 #include "appTypes.h"
 
 const ShaderAsset shaderAssets[SHADER_COUNT] = {
-    {"shaders/postfx.fs"}};
-
-
+    {"shaders/postfx.fs"}
+};
 
 const SoundtrackAsset soundtrackAssets[SOUNDTRACK_COUNT] = {
-    {"assets/sea.mp3"}};
+    {"assets/sea.mp3"}
+};
 
 
 void InitGame(App *app)
@@ -38,27 +38,24 @@ void InitGame(App *app)
   g->mouse = CreateMouse(0.10f, 5.0f, 10.0f, &mouseTexture);
 }
 
-void UpdateGame(App *app)
+void StartGame(App *app)
 {
-	GameState *g = &app->game;
 	if(!app->state.gameStarted){
 		app->state.gameStarted = true;
 	}
+}
 
-    if (GetFPS() <= 60)
-    {
-        SetTargetFPS(0);
-    }
 
-    if (IsKeyPressed(KEY_ESCAPE))
-    {
-        app->state.currentView = MENU;
-    }
+void UpdateGame(App *app)
+{
+	GameState *g = &app->game;
+	
+    SetTargetFPS(0);
 
-    if (WindowShouldClose() && !IsKeyPressed(KEY_ESCAPE))
-    {
-        app->state.running = false;
-    }
+	StartGame(app);
+
+	OnEscapeChangeView(app, MENU);
+	OnWindowClosedStoppApp(app);
 
 	for (int i = 0; i < SHADER_COUNT; i++)
     {
diff --git a/src/appMenuSettings.c b/src/appMenuSettings.c
index 6e497bf..a475630 100644
--- a/src/appMenuSettings.c
+++ b/src/appMenuSettings.c
@@ -18,7 +18,6 @@ void InitMenuSettings(MenuSettings *s)
 
 void UpdateMenuSettings(MenuSettings *s, MenuView *menuView,Flags *flags)
 {
-	ShowCursor();
 
 	if(isButtonClicked(&s->showFPS)){
 		flags->showFPS = !flags->showFPS;
diff --git a/src/appState.c b/src/appState.c
new file mode 100644
index 0000000..dedbded
--- /dev/null
+++ b/src/appState.c
@@ -0,0 +1,17 @@
+#include "appTypes.h"
+
+void OnEscapeChangeView(App *app, View view)
+{	
+	if (IsKeyPressed(KEY_ESCAPE))
+	{
+		app->state.currentView = view;
+	}
+}
+
+void OnWindowClosedStoppApp(App *app)
+{
+    if (WindowShouldClose() && !IsKeyPressed(KEY_ESCAPE))
+    {
+        app->state.running = false;
+    }
+}