diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index e645a679..823a8740 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -256,7 +256,7 @@ void BusinessScrub_Action5(Entity* this) {
             } else {
                 ModRupees(-offer->price);
                 switch (offer->field_0x0 >> 2) {
-                    case 0: //random kinstone
+                    case 0: // random kinstone
                         subtype = offer->item_subtype;
                         if (subtype == KINSTONE_RANDOM) {
                             subtype = kinstoneTypes[Random() & 7];
@@ -272,12 +272,12 @@ void BusinessScrub_Action5(Entity* this) {
                         SetLocalFlag(KS_B06);
 #endif
                         return;
-                    case 1: //refill, bottle, specific kinstone
+                    case 1: // refill, bottle, specific kinstone
                         CreateItemEntity(offer->offeredItem, offer->item_subtype, 0);
                         this->timer = 4;
                         sub_0802922C(this);
                         return;
-                    case 2: //grip ring
+                    case 2: // grip ring
                         CreateItemEntity(offer->offeredItem, offer->item_subtype, 0);
                         this->timer = 8;
                         sub_0802922C(this);
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 67149596..2133d809 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -62,9 +62,9 @@ const u8 gUnk_0811162B[] = {
     ITEM_SKILL_SWORD_BEAM,
     ITEM_SKILL_PERIL_BEAM,
     ITEM_SKILL_GREAT_SPIN,
-    ITEM_SKILL_FAST_SPIN|0x80,
-    ITEM_SKILL_FAST_SPLIT|0x80,
-    ITEM_SKILL_LONG_SPIN|0x80,
+    ITEM_SKILL_FAST_SPIN | 0x80,
+    ITEM_SKILL_FAST_SPLIT | 0x80,
+    ITEM_SKILL_LONG_SPIN | 0x80,
     0,
     0,
     0,
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index e1e181f5..aa5c9c86 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -58,7 +58,8 @@ void sub_0806C7D4(Entity* this) {
         sub_0806F118(this);
     } else {
         sub_0807DD94(this, NULL);
-        if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(SORA_ELDER_RECOVER)) && (CheckRoomFlag(0))) {
+        if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(SORA_ELDER_RECOVER)) &&
+            (CheckRoomFlag(0))) {
             this->type2 = 7;
             sub_0807DD80(this, &script_WindTribespeople6);
         }
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index 9105681a..96702b71 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -178,7 +178,7 @@ void ChestSpawner_Type2Action4(ChestSpawnerEntity* this) {
 }
 
 void sub_08084074(u32 flag) {
-    TileEntity* tileEntity = (TileEntity *)GetCurrentRoomProperty(3);
+    TileEntity* tileEntity = (TileEntity*)GetCurrentRoomProperty(3);
     if (tileEntity != NULL) {
         for (; tileEntity->type != 0; tileEntity++) {
             if ((tileEntity->type == BIG_CHEST) && (flag == tileEntity->localFlag)) {
diff --git a/src/object/graveyardKey.c b/src/object/graveyardKey.c
index b9e142be..3a4d664c 100644
--- a/src/object/graveyardKey.c
+++ b/src/object/graveyardKey.c
@@ -45,8 +45,8 @@ void GraveyardKey_Action2(Entity*, const struct_gUnk_08123FB0*);
 void GraveyardKey_Action3(Entity*, const struct_gUnk_08123FB0*);
 
 static const struct_gUnk_08123FB0 gUnk_08123FB0[] = {
-    { sub_0809D91C, sub_0809D93C, 0, 0, 0x30, 0x30, 0x1, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021,
-      0x1, 0x0 },
+    { sub_0809D91C, sub_0809D93C, 0, 0, 0x30, 0x30, 0x1, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13,
+      Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 },
     { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_HEART_PIECE, ITEM_HEART_PIECE, 0x10, 0, 0x1800, 0, 0x18,
 #if defined(JP) || defined(DEMO_JP) || defined(EU)
       0xCD,
@@ -54,11 +54,16 @@ static const struct_gUnk_08123FB0 gUnk_08123FB0[] = {
       0xd0,
 #endif
       0, 0 },
-    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xf, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 },
-    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x2, Q_16_16(1.0), 0x1800, 0x140, 0x40, 0x4021, 0x1, 0x0 },
-    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xd, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 },
-    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x1a, Q_16_16(1.0), 0x1800, 0x100, 0x40, 0x4021, 0x1, 0x0 },
-    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800, 0x60, 0x40, 0x4021, 0x1, 0x0 },
+    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xf, Q_16_16(1.0), 0x1800,
+      0x60, 0x40, 0x4021, 0x1, 0x0 },
+    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x2, Q_16_16(1.0), 0x1800,
+      0x140, 0x40, 0x4021, 0x1, 0x0 },
+    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0xd, Q_16_16(1.0), 0x1800,
+      0x60, 0x40, 0x4021, 0x1, 0x0 },
+    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x1a, Q_16_16(1.0), 0x1800,
+      0x100, 0x40, 0x4021, 0x1, 0x0 },
+    { sub_0809D91C, NULL, 0, 0, 0, 0, 0, ITEM_QST_GRAVEYARD_KEY, ITEM_QST_GRAVEYARD_KEY, 0x13, Q_16_16(1.0), 0x1800,
+      0x60, 0x40, 0x4021, 0x1, 0x0 },
     { NULL, NULL, 0, 0, 0, 0, 0, ITEM_KINSTONE, ITEM_KINSTONE, 0x81, 0, 0x1800, 0x100, 0x20, 0x0, 0x1, 0x0 },
 };
 
diff --git a/src/roomInit.c b/src/roomInit.c
index b620a767..51b92921 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -5716,7 +5716,7 @@ extern EntityData gUnk_080F77F0;
 extern EntityData gUnk_080F77C0;
 extern EntityData gUnk_080F7810;
 extern EntityData gUnk_080F7860;
-extern EntityData gUnk_080F78A0;\
+extern EntityData gUnk_080F78A0;
 
 void sub_StateChange_HyruleField_LonLonRanch(void) {
     CloudOverlayManager_Main(NULL);
diff --git a/src/script.c b/src/script.c
index 811ee12a..d5101f4a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1368,7 +1368,7 @@ void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context) {
     gActiveScriptInfo.commandSize = 0;
 }
 
-//player movement?
+// player movement?
 void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context) {
     if (!context->unk_18) {
         context->unk_18 = 1;