@@ -53,22 +53,22 @@
 
 extern unsigned long OFHashSeed;
 
 #ifdef OF_PSP
 static int
-exit_cb(int arg1, int arg2, void *arg)
+exitCallback(int arg1, int arg2, void *arg)
 {
 	sceKernelExitGame();
 
 	return 0;
 }
 
 static int
-callback_thread(SceSize args, void *argp)
+threadCallback(SceSize args, void *argp)
 {
 	sceKernelRegisterExitCallback(
-	    sceKernelCreateCallback("Exit Callback", exit_cb, NULL));
+	    sceKernelCreateCallback("Exit Callback", exitCallback, NULL));
 	sceKernelSleepThreadCB();
 
 	return 0;
 }
 #endif
@@ -120,11 +120,11 @@
 	pspDebugScreenInit();
 
 	sceCtrlSetSamplingCycle(0);
 	sceCtrlSetSamplingMode(PSP_CTRL_MODE_DIGITAL);
 
-	if ((tid = sceKernelCreateThread("update_thread", callback_thread,
+	if ((tid = sceKernelCreateThread("update_thread", threadCallback,
 	    0x11, 0xFA0, 0, 0)) >= 0)
 		sceKernelStartThread(tid, 0, 0);
 #endif
 
 #ifdef OF_NINTENDO_DS
@@ -198,33 +198,30 @@
 	return OFApplicationMain(&argc, &argv, [[TestsAppDelegate alloc] init]);
 #endif
 }
 
 @implementation TestsAppDelegate
-- (void)outputTesting: (OFString *)test
-	     inModule: (OFString *)module
+- (void)outputTesting: (OFString *)test inModule: (OFString *)module
 {
 	if (OFStdOut.hasTerminal) {
 		[OFStdOut setForegroundColor: [OFColor yellow]];
 		[OFStdOut writeFormat: @"[%@] %@: testing...", module, test];
 	} else
 		[OFStdOut writeFormat: @"[%@] %@: ", module, test];
 }
 
-- (void)outputSuccess: (OFString *)test
-	     inModule: (OFString *)module
+- (void)outputSuccess: (OFString *)test inModule: (OFString *)module
 {
 	if (OFStdOut.hasTerminal) {
 		[OFStdOut setForegroundColor: [OFColor lime]];
 		[OFStdOut eraseLine];
 		[OFStdOut writeFormat: @"\r[%@] %@: ok\n", module, test];
 	} else
 		[OFStdOut writeLine: @"ok"];
 }
 
-- (void)outputFailure: (OFString *)test
-	     inModule: (OFString *)module
+- (void)outputFailure: (OFString *)test inModule: (OFString *)module
 {
 	if (OFStdOut.hasTerminal) {
 		[OFStdOut setForegroundColor: [OFColor red]];
 		[OFStdOut eraseLine];
 		[OFStdOut writeFormat: @"\r[%@] %@: failed\n", module, test];