diff --git a/src/_ob_past_brick.c b/src/_ob_past_brick.c
index 3d1db2a..f0f3c69 100644
--- a/src/_ob_past_brick.c
+++ b/src/_ob_past_brick.c
@@ -15,22 +15,22 @@ OSMesgQueue* nuScGetGfxMQ() {
 }
 
 void nuScEventHandler(void) {
-    OSMesg  msg;
-    s32     beforeResetFrame;
+    s32  msg;
+    s32  beforeResetFrame;
 
     nuScRetraceCounter = 0;
 
     while (TRUE) {
-        osRecvMesg(&nusched.retraceMQ, &msg, OS_MESG_BLOCK);
+        osRecvMesg(&nusched.retraceMQ, (OSMesg)&msg, OS_MESG_BLOCK);
 
-        switch ((s32) msg) {
+        switch (msg) {
             case 666:
                 nuScRetraceCounter++;
 
                 nuScEventBroadcast(&nusched.retraceMsg);
 
-                if (nuScPreNMIFlag){
-                    if (beforeResetFrame){
+                if (nuScPreNMIFlag) {
+                    if (beforeResetFrame) {
                         beforeResetFrame--;
                     } else {
                         nuScPreNMIFlag |= NU_SC_BEFORE_RESET;
@@ -45,13 +45,12 @@ void nuScEventHandler(void) {
                 nuScPreNMIFlag = NU_SC_PRENMI_GET;
                 nuScEventBroadcast(&nusched.prenmiMsg);
 
-                if (nuScPreNMIFunc != NULL){
-                    (*nuScPreNMIFunc)();
-                }
+                if (nuScPreNMIFunc != NULL)
+                    nuScPreNMIFunc();
 
                 beforeResetFrame = (nusched.frameRate / 2) / nusched.retraceCount - 3;
                 break;
-                
+
             default:
                 break;
         }