diff --git a/source/draw.h b/source/draw.h
index 608b24a..8387eac 100644
--- a/source/draw.h
+++ b/source/draw.h
@@ -23,10 +23,4 @@ void DrawString(unsigned char *screen, const char *str, int x, int y, int color,
 void DrawStringF(int x, int y, const char *format, ...);
 void DrawHexWithName(unsigned char *screen, const char *str, unsigned int hex, int x, int y, int color, int bgcolor);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 void Debug(const char *format, ...);
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/gamecart/protocol.c b/source/gamecart/protocol.c
index d0e7548..6a6bb6b 100644
--- a/source/gamecart/protocol.c
+++ b/source/gamecart/protocol.c
@@ -1,4 +1,3 @@
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -26,24 +25,21 @@ u32 BSWAP32(u32 val) {
            ((val & 0xFF) << 24);
 }
 
-//Reset the cart slot?
 #define REG_CARDCONF (*(vu16*)0x1000000C)
 #define REG_CARDCONF2 (*(vu8*)0x10000010)
-void GatewayCartInit()
+
+// TODO: Verify
+void ResetCartSlot()
 {
     REG_CARDCONF2 = 0x0C;
-
     REG_CARDCONF &= ~3;
 
-    if(REG_CARDCONF2 == 0xC)
-    {
-        while(REG_CARDCONF2 != 0);
+    if (REG_CARDCONF2 == 0xC) {
+        while (REG_CARDCONF2 != 0);
     }
 
-    if(REG_CARDCONF2 != 0)
-    {
+    if (REG_CARDCONF2 != 0)
         return;
-    }
 
     REG_CARDCONF2 = 0x4;
     while(REG_CARDCONF2 != 0x4);
@@ -69,7 +65,7 @@ void SwitchToCTRCARD()
 u32 Cart_GetSecureID()
 {
     u32 id = 0;
-    u32 getid_cmd[4] = { 0xA2000000, 0x00000000, rand1, rand2 };
+    const u32 getid_cmd[4] = { 0xA2000000, 0x00000000, rand1, rand2 };
     CTR_SendCommand(getid_cmd, 0x4, 1, 0x100802C, &id);
     return id;
 }
@@ -79,12 +75,12 @@ int Cart_IsInserted()
     return (0x9000E2C2 == Cart_GetSecureID() );
 }
 
-void Cart_ReadSectorSD(u8* aBuffer,u32 aSector)
+void Cart_ReadSectorSD(u8* aBuffer, u32 aSector)
 {
     u64 adr = ((u64)0xBF << 56) | (aSector * 0x200);
-    u32 readheader_cmd[4] = {
+    const u32 readheader_cmd[4] = {
         (u32)(adr >> 32),
-        (u32)(adr&0xFFFFFFFF),
+        (u32)(adr & 0xFFFFFFFF),
         0x00000000, 0x00000000
     };
     CTR_SendCommand( readheader_cmd, 0x200, 1, 0x100802C, aBuffer );
@@ -97,19 +93,18 @@ u32 Cart_GetID()
 
 void Cart_Init()
 {
-    GatewayCartInit(); //Seems to reset the cart slot?
+    ResetCartSlot(); //Seems to reset the cart slot?
 
     REG_CTRCARDSECCNT &= 0xFFFFFFFB;
-
     ioDelay(0xF000);
 
     SwitchToNTRCARD();
-
     ioDelay(0xF000);
 
     REG_NTRCARDROMCNT = 0;
     REG_NTRCARDMCNT = REG_NTRCARDMCNT&0xFF;
     ioDelay(167550);
+
     REG_NTRCARDMCNT |= (NTRCARD_CR1_ENABLE | NTRCARD_CR1_IRQ);
     REG_NTRCARDROMCNT = NTRCARD_nRESET | NTRCARD_SEC_SEED;
     while (REG_NTRCARDROMCNT & NTRCARD_BUSY);
@@ -121,8 +116,8 @@ void Cart_Init()
     u32 getid_cmd[2] = { 0x90000000, 0x00000000 };
     NTR_SendCommand(getid_cmd, 0x4, NTRCARD_CLK_SLOW | NTRCARD_DELAY1(0x1FFF) | NTRCARD_DELAY2(0x18), &CartID);
 
-    if ((CartID & 0x10000000)) // 3ds
-    {
+    // 3ds
+    if (CartID & 0x10000000) {
         u32 unknowna0_cmd[2] = { 0xA0000000, 0x00000000 };
         NTR_SendCommand(unknowna0_cmd, 0x4, 0, &A0_Response);
 
@@ -130,7 +125,6 @@ void Cart_Init()
         NTR_SendCommand(enter16bytemode_cmd, 0x0, 0, NULL);
 
         SwitchToCTRCARD();
-
         ioDelay(0xF000);
 
         REG_CTRCARDBLKCNT = 0;
@@ -139,9 +133,9 @@ void Cart_Init()
 
 void SendReadCommand( u32 sector, u32 length, u32 blocks, void * buffer )
 {
-    u32 read_cmd[4] = {
-        (0xBF000000 | (u32)(sector>>23)),
-        (u32)((sector<<9) & 0xFFFFFFFF),
+    const u32 read_cmd[4] = {
+        (0xBF000000 | (u32)(sector >> 23)),
+        (u32)((sector << 9) & 0xFFFFFFFF),
         0x00000000, 0x00000000
     };
     CTR_SendCommand(read_cmd, length, blocks, 0x100822C, buffer);
@@ -149,7 +143,7 @@ void SendReadCommand( u32 sector, u32 length, u32 blocks, void * buffer )
 
 void GetHeader(void * buffer)
 {
-    u32 readheader_cmd[4] = { 0x82000000, 0x00000000, 0x00000000, 0x00000000 };
+    static const u32 readheader_cmd[4] = { 0x82000000, 0x00000000, 0x00000000, 0x00000000 };
     CTR_SendCommand(readheader_cmd, 0x200, 1, 0x4802C, buffer);
 }
 
@@ -198,20 +192,19 @@ void Cart_Secure_Init(u32 *buf,u32 *out)
 
     u8 mac_valid = card_aes(out, buf, 0x200);
 
-//    if(!mac_valid)
+//    if (!mac_valid)
 //        ClearScreen(bottomScreen, RGB(255, 0, 0));
 
     ioDelay(0xF0000);
 
     CTR_SetSecKey(A0_Response);
-
     CTR_SetSecSeed(out, true);
 
     rand1 = 0x42434445;//*((vu32*)0x10011000);
     rand2 = 0x46474849;//*((vu32*)0x10011010);
 
-    u32 seed_cmd[4] = { 0x83000000, 0x00000000, rand1, rand2 };
-    CTR_SendCommand( seed_cmd, 0, 1, 0x100822C, NULL );
+    const u32 seed_cmd[4] = { 0x83000000, 0x00000000, rand1, rand2 };
+    CTR_SendCommand(seed_cmd, 0, 1, 0x100822C, NULL);
 
     out[3] = BSWAP32(rand2);
     out[2] = BSWAP32(rand1);
@@ -220,25 +213,25 @@ void Cart_Secure_Init(u32 *buf,u32 *out)
     //ClearScreen(bottomScreen, RGB(255, 0, 255));
 
     u32 test = 0;
-    u32 A2_cmd[4] = { 0xA2000000, 0x00000000, rand1, rand2 };
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
+    const u32 A2_cmd[4] = { 0xA2000000, 0x00000000, rand1, rand2 };
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
 
     //ClearScreen(bottomScreen, RGB(0, 255, 0));
 
     u32 test2 = 0;
-    u32 A3_cmd[4] = { 0xA3000000, 0x00000000, rand1, rand2 };
-    CTR_SendCommand( A3_cmd, 4, 1, 0x100822C, &test2 );
+    const u32 A3_cmd[4] = { 0xA3000000, 0x00000000, rand1, rand2 };
+    CTR_SendCommand(A3_cmd, 4, 1, 0x100822C, &test2);
 
     //ClearScreen(bottomScreen, RGB(255, 0, 0));
 
-    u32 C5_cmd[4] = { 0xC5000000, 0x00000000, rand1, rand2 };
-    CTR_SendCommand( C5_cmd, 0, 1, 0x100822C, NULL );
+    const u32 C5_cmd[4] = { 0xC5000000, 0x00000000, rand1, rand2 };
+    CTR_SendCommand(C5_cmd, 0, 1, 0x100822C, NULL);
 
     //ClearScreen(bottomScreen, RGB(0, 0, 255));
 
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
-    CTR_SendCommand( A2_cmd, 4, 1, 0x100822C, &test );
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
+    CTR_SendCommand(A2_cmd, 4, 1, 0x100822C, &test);
 }
diff --git a/source/gamecart/protocol.h b/source/gamecart/protocol.h
index 172d61f..53e7876 100644
--- a/source/gamecart/protocol.h
+++ b/source/gamecart/protocol.h
@@ -6,8 +6,7 @@ u32 BSWAP32(u32 val);
 void Cart_Init();
 int Cart_IsInserted();
 void Cart_ReadSectorSD(u8* aBuffer, u32 aSector);
-u32 SendReadCommand(u32 adr, u32 length, u32 blocks, void * buffer);
+u32 SendReadCommand(u32 adr, u32 length, u32 blocks, void* buffer);
 u32 GetHeader(void* buffer);
-int Cart_Nin_Init();
 u32 Cart_GetID();
 void Cart_Secure_Init(u32* buf, u32* out);
diff --git a/source/gamecart/protocol_ctr.c b/source/gamecart/protocol_ctr.c
index 477f5b1..c58c760 100644
--- a/source/gamecart/protocol_ctr.c
+++ b/source/gamecart/protocol_ctr.c
@@ -9,7 +9,7 @@ void CTR_SetSecKey(u32 value) {
     while (!(REG_CTRCARDSECCNT & 0x4000));
 }
 
-void CTR_SetSecSeed(u32 *seed, bool flag) {
+void CTR_SetSecSeed(const u32* seed, bool flag) {
     REG_CTRCARDSECSEED = BSWAP32(seed[3]);
     REG_CTRCARDSECSEED = BSWAP32(seed[2]);
     REG_CTRCARDSECSEED = BSWAP32(seed[1]);
@@ -23,7 +23,7 @@ void CTR_SetSecSeed(u32 *seed, bool flag) {
     }
 }
 
-void CTR_SendCommand(u32 command[4], u32 pageSize, u32 blocks, u32 latency, void * buffer)
+void CTR_SendCommand(const u32 command[4], u32 pageSize, u32 blocks, u32 latency, void* buffer)
 {
     REG_CTRCARDCMD[0] = command[3];
     REG_CTRCARDCMD[1] = command[2];
diff --git a/source/gamecart/protocol_ctr.h b/source/gamecart/protocol_ctr.h
index d490e3e..e9b4b6d 100644
--- a/source/gamecart/protocol_ctr.h
+++ b/source/gamecart/protocol_ctr.h
@@ -3,6 +3,6 @@
 #include "common.h"
 
 void CTR_SetSecKey(u32 value);
-void CTR_SetSecSeed(u32 *seed, bool flag);
+void CTR_SetSecSeed(const u32* seed, bool flag);
 
-void CTR_SendCommand(u32 command[4], u32 pageSize, u32 blocks, u32 latency, void* buffer);
+void CTR_SendCommand(const u32 command[4], u32 pageSize, u32 blocks, u32 latency, void* buffer);
diff --git a/source/gamecart/protocol_ntr.c b/source/gamecart/protocol_ntr.c
index adc6288..182e006 100644
--- a/source/gamecart/protocol_ntr.c
+++ b/source/gamecart/protocol_ntr.c
@@ -2,7 +2,7 @@
 
 #include "misc.h"
 
-void NTR_SendCommand( u32 command[2], u32 pageSize, u32 latency, void * buffer )
+void NTR_SendCommand(const u32 command[2], u32 pageSize, u32 latency, void* buffer)
 {
     REG_NTRCARDMCNT = NTRCARD_CR1_ENABLE;
 
diff --git a/source/gamecart/protocol_ntr.h b/source/gamecart/protocol_ntr.h
index bdeb0dd..4403cf5 100644
--- a/source/gamecart/protocol_ntr.h
+++ b/source/gamecart/protocol_ntr.h
@@ -2,4 +2,4 @@
 
 #include "common.h"
 
-void NTR_SendCommand(u32 command[2], u32 pageSize, u32 latency, void* buffer);
+void NTR_SendCommand(const u32 command[2], u32 pageSize, u32 latency, void* buffer);
diff --git a/source/start.s b/source/start.s
index e89cf47..9e793da 100644
--- a/source/start.s
+++ b/source/start.s
@@ -18,5 +18,5 @@ _init:
 	bl main
 	ldmfd sp!, {r0-r12, lr}
 
-	@ return control to FIRM	
+	@ return control to FIRM
 	ldr pc, arm9ep_backup
diff --git a/source/util.s b/source/util.s
deleted file mode 100644
index 5e76b87..0000000
--- a/source/util.s
+++ /dev/null
@@ -1,34 +0,0 @@
-@ this code start at 0x01FF8000 in physical memory on ARM9 and branches to main().
-
-.section .boot
-
-
-.global Cleanbss
-.global svcSleepThread
-
-.type Cleanbss STT_FUNC
-.type svcSleepThread STT_FUNC
-
-.align 4
-.arm
-
-Cleanbss:
-  push {r0-r3}
-  ldr r1, =__bss_start
-  ldr r2, =__bss_end
-  mov r3, #0
-
-  bss_clr:
-  cmp r1, r2
-  popeq {r0-r3}
-  bxeq lr
-  str r3, [r1]
-  add r1, r1, #4
-  b bss_clr
-.pool
-
-
-svcSleepThread:
-  svc 0x0A
-  bx lr
-.pool