diff --git a/.gitignore b/.gitignore
index a36b9d2c..99e2dcdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,12 @@ undefined_syms_auto.txt
 *.ninja
 permuter_settings.toml
 
+## MacOS
+.DS_Store
+
+## Linux
+*.swp
+
 ## Binary/object products
 **/bin/
 **/obj/
@@ -31,7 +37,6 @@ permuter_settings.toml
 **/compile_commands.json
 
 # Compiled Object files
-**/.DS_Store
 *.slo
 *.lo
 *.o
diff --git a/src/P2/.game.c.swp b/src/P2/.game.c.swp
deleted file mode 100644
index 70f74996..00000000
Binary files a/src/P2/.game.c.swp and /dev/null differ
diff --git a/src/P2/game.c b/src/P2/game.c
index 09949843..e80aa6da 100644
--- a/src/P2/game.c
+++ b/src/P2/game.c
@@ -1,10 +1,8 @@
 #include <game.h>
 
-
 void StartupGame(void)
 {
-  StartGame();
-  return;
+    StartGame();
 }
 
 INCLUDE_ASM(const s32, "P2/game", func_00160090);
@@ -61,8 +59,7 @@ INCLUDE_ASM(const s32, "P2/game", calculate_percent_completion);
 
 void SetCcharm(int nParam)
 {
-  g_pgsCur->ccharm = nParam;
-  return;
+    g_pgsCur->ccharm = nParam;
 }
 
 INCLUDE_ASM(const s32, "P2/game", FCharmAvailable__Fv);
@@ -75,19 +72,17 @@ INCLUDE_ASM(const s32, "P2/game", clr_8_bytes_1);
 
 void FUN_00160ce8(int param_1)
 {
-  *(undefined4 *)(param_1 + 4) = 0;
-  return;
+    *(undefined4 *)(param_1 + 4) = 0;
 }
 
 void OnGameAlarmTriggered(GAME *pgame)
 {
-  pgame->cAlarmsTriggered++;
+    pgame->cAlarmsTriggered++;
 }
 
 void OnGameAlarmDisabled(GAME *pgame)
 {
-  pgame->cAlarmsTriggered--;
-  return;
+    pgame->cAlarmsTriggered--;
 }
 
 INCLUDE_ASM(const s32, "P2/game", grfvault_something__Fv);
@@ -96,6 +91,7 @@ INCLUDE_ASM(const s32, "P2/game", GetBlueprintInfo);
 
 int CcharmMost()
 {
+    // Holdover from when there was a powerup that increased the charm limit
     return 2;
 }