diff --git a/sys/init/main.c b/sys/init/main.c
index a1be926..c1011c0 100644
--- a/sys/init/main.c
+++ b/sys/init/main.c
@@ -41,10 +41,10 @@
 
 #define B_ADAPTORSHIFT          24
 #define B_ADAPTORMASK           0x0f
-#define B_ADAPTOR(val)          (((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
+#define B_ADAPTOR( val )        ( ( ( val ) >> B_ADAPTORSHIFT ) & B_ADAPTORMASK )
 #define B_CONTROLLERSHIFT       20
 #define B_CONTROLLERMASK        0xf
-#define B_CONTROLLER(val)       (((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
+#define B_CONTROLLER( val )     ( ( ( val ) >> B_CONTROLLERSHIFT ) & B_CONTROLLERMASK )
 
 /*
  * Constants for converting boot-style device number to type,
@@ -60,16 +60,16 @@
  */
 #define B_SLICESHIFT            20
 #define B_SLICEMASK             0xff
-#define B_SLICE(val)            (((val)>>B_SLICESHIFT) & B_SLICEMASK)
+#define B_SLICE( val )          ( ( ( val ) >> B_SLICESHIFT ) & B_SLICEMASK )
 #define B_UNITSHIFT             16
 #define B_UNITMASK              0xf
-#define B_UNIT(val)             (((val) >> B_UNITSHIFT) & B_UNITMASK)
+#define B_UNIT( val )           ( ( ( val ) >> B_UNITSHIFT ) & B_UNITMASK )
 #define B_PARTITIONSHIFT        8
 #define B_PARTITIONMASK         0xff
-#define B_PARTITION(val)        (((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
+#define B_PARTITION( val )      ( ( ( val ) >> B_PARTITIONSHIFT ) & B_PARTITIONMASK )
 #define B_TYPESHIFT             0
 #define B_TYPEMASK              0xff
-#define B_TYPE(val)             (((val) >> B_TYPESHIFT) & B_TYPEMASK)
+#define B_TYPE( val )           ( ( ( val ) >> B_TYPESHIFT ) & B_TYPEMASK )
 
 /*****************************************************************************************
  Desc: The Kernels Descriptor table:
@@ -98,25 +98,34 @@
 ubixStandardDescriptor( 0x4200,			( sizeof( struct tssStruct ) ),	( dTss + dDpl3 ) ),
 ubixStandardDescriptor( 0x0000,			0xFFFFF,						( dCode + dRead + dBig + dBiglim + dDpl3 ) ),
 ubixStandardDescriptor( 0x0000,			0xFFFFF,						( dData + dWrite + dBig + dBiglim + dDpl3 ) ),
-ubixStandardDescriptor( 0x5200,			( sizeof(struct tssStruct)),	( dTss + dDpl3 ) ),
-ubixStandardDescriptor( 0x6200,			( sizeof(struct tssStruct)),	( dTss ) ),
+ubixStandardDescriptor( 0x5200,			( sizeof( struct tssStruct ) ),	( dTss + dDpl3 ) ),
+ubixStandardDescriptor( 0x6200,			( sizeof( struct tssStruct ) ),	( dTss ) ),
 ubixStandardDescriptor( 0x0000,			0xFFFFF,						( dData + dWrite + dBig + dBiglim + dDpl0 ) ),
 ubixStandardDescriptor( 0xBFC00000,		0xFFFFF,						( dData + dWrite + dBig + dBiglim + dDpl3 ) ),
 };
 
 struct {
-	unsigned short limit __attribute__ ((packed));
-	union descriptorTableUnion *gdt __attribute__ ((packed));
-} loadGDT = { (11 * sizeof(union descriptorTableUnion) - 1), ubixGDT };
+	unsigned short limit __attribute__ ( ( packed ) );
+	union descriptorTableUnion *gdt __attribute__ ( ( packed ) );
+} loadGDT = { ( 11 * sizeof( union descriptorTableUnion ) - 1 ), ubixGDT };
 
 static char *argv_init[2] = { "init", 0x0, }; /* ARGV For Initial Process */
 
-static char *envp_init[6] = { "HOME=/", "PWD=/",
-		"PATH=/bin:/sbin:/usr/bin:/usr/sbin", "USER=root", "GROUP=admin", 0x0, }; /* ENVP For Initial Process */
+static char *envp_init[6] = {
+		"HOME=/",
+		"PWD=/",
+		"PATH=/bin:/sbin:/usr/bin:/usr/sbin",
+		"USER=root",
+		"GROUP=admin",
+		0x0,
+}; /* ENVP For Initial Process */
 
 struct bootinfo _bootinfo;
+
 char _kernelname[512];
+
 u_long _bootdev;
+
 u_long _boothowto;
 
 /**
@@ -133,11 +142,11 @@
 	clearScreen();
 
 	/* Modify src/sys/include/ubixos/init.h to add a startup routine */
-	for (i = 0x0; i < init_tasksTotal; i++) {
+	for ( i = 0x0; i < init_tasksTotal; i++ ) {
 
-		if (init_tasks[i]() != 0x0) {
+		if ( init_tasks[i]() != 0x0 ) {
 
-			kpanic("Error: Initializing System Task[%i].\n", i);
+			kpanic( "Error: Initializing System Task[%i].\n", i );
 
 		}
 
@@ -151,23 +160,23 @@
 
 	/* if ( vfs_mount( B_UNIT(_bootdev), B_PARTITION(_bootdev), 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { */
 
-	if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "sys2", "rw") != 0x0) { //UFS FS
+	if ( vfs_mount( 0x1, 0x2, 0x0, 0xAA, "sys2", "rw" ) != 0x0 ) { //UFS FS
 
-		kprintf("Problem Mounting sys2 Mount Point\n");
+		kprintf( "Problem Mounting sys2 Mount Point\n" );
 
 	} else {
 
-		kprintf("Mounted sys2\n");
+		kprintf( "Mounted sys2\n" );
 
 	}
 
-	if (vfs_mount(0x2, 0x1, 0x1, 0xFA, "sys", "rw") != 0x0) { //FAT FS
+	if ( vfs_mount(0x2, 0x1, 0x1, 0xFA, "sys", "rw") != 0x0 ) { //FAT FS
 
-		kprintf("Problem Mounting sys Mount Point\n");
+		kprintf( "Problem Mounting sys Mount Point\n" );
 
 	} else {
 
-		kprintf("Mounted sys\n");
+		kprintf( "Mounted sys\n" );
 
 	}
 
@@ -182,39 +191,40 @@
 	 */
 
 	/* Initialize the system */
-	kprintf("Free Pages: [%i]\n", systemVitals->freePages);
-	kprintf("MemoryMap:  [0x%X]\n", vmmMemoryMap);
-	kprintf("Starting OS\n");
+	kprintf( "Free Pages: [%i]\n", systemVitals->freePages );
+	kprintf( "MemoryMap:  [0x%X]\n", vmmMemoryMap );
+	kprintf( "Starting OS\n" );
 
 	/* kprintf("SDE Thread Start! [0x%X]\n", &sdeThread); */
 	/* execThread(&sdeThread, 0x2000,0x0); */
 
-	kprintf("Kernel Name: [%s], Boot How To [0x%X], Boot Dev: [0x%X]\n",
+	kprintf( "Kernel Name: [%s], Boot How To [0x%X], Boot Dev: [0x%X]\n",
 			_kernelname, _boothowto, _bootdev);
 
-	kprintf("B_TYPE(0x%X), B_SLICE(0x%X), B_UNIT(0x%X), B_PARTITION(0x%X)\n",
+	kprintf( "B_TYPE(0x%X), B_SLICE(0x%X), B_UNIT(0x%X), B_PARTITION(0x%X)\n",
 			B_TYPE(_bootdev), B_SLICE(_bootdev), B_UNIT(_bootdev),
-			B_PARTITION(_bootdev));
+			B_PARTITION(_bootdev) );
 
-	kprintf("_bootinfo.bi_version: 0x%X\n", _bootinfo.bi_version);
+	kprintf( "_bootinfo.bi_version: 0x%X\n", _bootinfo.bi_version );
 
-	kprintf("_bootinfo.bi_size: 0x%X\n", _bootinfo.bi_size);
+	kprintf( "_bootinfo.bi_size: 0x%X\n", _bootinfo.bi_size );
 	
-	kprintf("_bootinfo.bi_bios_dev: 0x%X\n", _bootinfo.bi_bios_dev);
+	kprintf( "_bootinfo.bi_bios_dev: 0x%X\n", _bootinfo.bi_bios_dev );
 
-	execThread(systemTask, 0x2000, 0x0);
+	execThread( systemTask, 0x2000, 0x0 );
 
-	execFile("sys:/bin/init", argv_init, envp_init, 0x0); /* OS Initializer    */
+	execFile( "sys:/bin/init", argv_init, envp_init, 0x0 ); /* OS Initializer    */
 
 	//execFile("fat:/bin/init", argv_init, envp_init, 0x0);
 
-	irqEnable(0x0);
+	irqEnable( 0x0 );
 
-	while (0x1)
-		asm("hlt");
+	while ( 0x1 )
+		asm( "hlt" );
 
 	/* Keep halting until the scheduler reacts */
 
 	/* Return to start however we should never get this far */
-	return (0x0);
+	return ( 0x0 );
+
 }
diff --git a/sys/init/start.S b/sys/init/start.S
index edbd77b..f6f0f55 100644
--- a/sys/init/start.S
+++ b/sys/init/start.S
@@ -31,7 +31,7 @@
 #define BI_ENDCOMMON  12
 #define BI_SIZE       48
 #define BOOTINFO_SIZE 135
-#define	RB_BOOTINFO	0x80000000	/* have `struct bootinfo *' arg */
+#define	RB_BOOTINFO	  0x80000000	/* have `struct bootinfo *' arg */
 
 
 .globl _start
@@ -113,7 +113,7 @@
   movl    28(%ebp),%ebx           /* &bootinfo.version */
   movl    BI_VERSION(%ebx),%eax
   cmpl    $1,%eax                 /* We only understand version 1 */
-  je      1f
+  je      0f
   movl    $1,%eax                 /* Return status */
   leave
   /*
@@ -122,7 +122,7 @@
    */
   hlt /* MrO */
   ret
-1:
+0:
   /*
    * If we have a kernelname copy it in
    */
@@ -175,4 +175,4 @@
         ret
 
 .data
-.comm kStack,0x1000
+.comm kStack, 0x1000
diff --git a/sys/init/static.c b/sys/init/static.c
index f971539..3fdf8fd 100644
--- a/sys/init/static.c
+++ b/sys/init/static.c
@@ -29,17 +29,17 @@
 // XXX Set up the ctors
 int static_constructors( void ) {
 
-	extern void (*__ctor_list)();
+	extern void ( *__ctor_list )();
 
-	void (**l_ctor)() = &__ctor_list;
+	void ( **l_ctor )() = &__ctor_list;
 
- 	int l_ctorCount = *(int *) l_ctor;
+ 	int l_ctorCount = *( int * ) l_ctor;
 
 	l_ctor++;
 
-	while (l_ctorCount) {
+	while ( l_ctorCount ) {
 
-		(*l_ctor)();
+		( *l_ctor )();
 
 		l_ctorCount--;
 
@@ -47,6 +47,6 @@
 
 	}
 
-	return (0x0);
+	return( 0x0 );
 
 }