diff --git a/arch/x86/macros.h b/arch/x86/macros.h
index 0626e4b1a5..e1822ef97a 100644
--- a/arch/x86/macros.h
+++ b/arch/x86/macros.h
@@ -22,7 +22,6 @@
 #ifndef X86_MACROS_H
 #define X86_MACROS_H 1
 
-
 #define port80_post(value)	\
 	movb	$value, %al;	\
 	outb	%al, $0x80
diff --git a/arch/x86/mtrr.h b/arch/x86/mtrr.h
index 51c0b511c7..f5f18038d2 100644
--- a/arch/x86/mtrr.h
+++ b/arch/x86/mtrr.h
@@ -1,7 +1,6 @@
 #ifndef CPU_X86_MTRR_H
 #define CPU_X86_MTRR_H
 
-
 /*  These are the region types  */
 #define MTRR_TYPE_UNCACHEABLE 0
 #define MTRR_TYPE_WRCOMB     1
@@ -31,15 +30,12 @@
 #define MTRRfix4K_F0000_MSR 0x26e
 #define MTRRfix4K_F8000_MSR 0x26f
 
-
 #if !defined(__ROMCC__) && !defined (ASSEMBLY)
 
-
 void x86_setup_var_mtrrs(unsigned address_bits);
 void x86_setup_mtrrs(unsigned address_bits);
 int x86_mtrr_check(void);
 
-#endif /* __ROMCC__ */
+#endif				/* __ROMCC__ */
 
-
-#endif /* CPU_X86_MTRR_H */
+#endif				/* CPU_X86_MTRR_H */
diff --git a/arch/x86/serial.c b/arch/x86/serial.c
index ec5ca30d1c..d3eb1d3e0b 100644
--- a/arch/x86/serial.c
+++ b/arch/x86/serial.c
@@ -42,7 +42,7 @@
 #define TTYSx_BAUD 19200
 #elif defined(CONFIG_CONSOLE_SERIAL_9600)
 #define TTYSx_BAUD 9600
-#else // default
+#else				// default
 #define TTYSx_BAUD 115200
 #warning no serial speed set
 #endif
@@ -61,23 +61,21 @@
 
 #define UART_LCS	TTYSx_LCS
 
-
 void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
 
 void uart_init(void)
 {
-        unsigned ttysx_div;
+	unsigned ttysx_div;
 #if 0
 	unsigned ttysx_index;
-        static const unsigned char divisor[] = { 1,2,3,6,12,24,48,96 };
+	static const unsigned char divisor[] = { 1, 2, 3, 6, 12, 24, 48, 96 };
 
 	// read CMOS settings?
-        ttysx_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0);
-        ttysx_index &= 7;
-        ttysx_div = divisor[ttysx_index];
+	ttysx_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0);
+	ttysx_index &= 7;
+	ttysx_div = divisor[ttysx_index];
 #else
 	ttysx_div = TTYSx_DIV;
 #endif
 	uart8250_init(TTYSx_BASE, ttysx_div, UART_LCS);
 }
-
diff --git a/arch/x86/udelay_io.c b/arch/x86/udelay_io.c
index 9a17b836e2..898e471ef6 100644
--- a/arch/x86/udelay_io.c
+++ b/arch/x86/udelay_io.c
@@ -24,6 +24,5 @@ void udelay(int usecs)
 {
 	int i;
 	for (i = 0; i < usecs; i++)
-		outb(i&0xff, 0x80);
+		outb(i & 0xff, 0x80);
 }
-
diff --git a/console/vsprintf.c b/console/vsprintf.c
index b6517ff551..f0d3c8a23a 100644
--- a/console/vsprintf.c
+++ b/console/vsprintf.c
@@ -27,7 +27,8 @@
 #include <stdarg.h>
 #include <string.h>
 
-int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args);
+int vtxprintf(void (*tx_byte) (unsigned char byte), const char *fmt,
+	      va_list args);
 
 /* FIXME this global makes vsprintf non-reentrant */
 
@@ -38,7 +39,7 @@ static void str_tx_byte(unsigned char byte)
 	str_buf++;
 }
 
-int vsprintf(char * buf, const char *fmt, va_list args)
+int vsprintf(char *buf, const char *fmt, va_list args)
 {
 	int i;
 	str_buf = buf;
@@ -47,13 +48,13 @@ int vsprintf(char * buf, const char *fmt, va_list args)
 	return i;
 }
 
-int sprintf(char * buf, const char *fmt, ...)
+int sprintf(char *buf, const char *fmt, ...)
 {
 	va_list args;
 	int i;
 
 	va_start(args, fmt);
-	i=vsprintf(buf,fmt,args);
+	i = vsprintf(buf, fmt, args);
 	va_end(args);
 	return i;
 }
diff --git a/mainboard/emulation/qemu-x86/initram.c b/mainboard/emulation/qemu-x86/initram.c
index b67e043b7b..ba17accf43 100644
--- a/mainboard/emulation/qemu-x86/initram.c
+++ b/mainboard/emulation/qemu-x86/initram.c
@@ -34,5 +34,3 @@ int main(void)
 
 	return 0;
 }
-
-
diff --git a/mainboard/emulation/qemu-x86/mainboard.c b/mainboard/emulation/qemu-x86/mainboard.c
index cb8a0cfd36..44a49078f6 100644
--- a/mainboard/emulation/qemu-x86/mainboard.c
+++ b/mainboard/emulation/qemu-x86/mainboard.c
@@ -25,7 +25,8 @@
 char *mainboard_vendor = "emulation";
 char *mainboard_part_number = "qemu-x86";
 
-static void enable_dev(struct device *dev){
+static void enable_dev(struct device *dev)
+{
 	printk(BIOS_INFO, "qemu-x86 enable_dev done\n");
 }
 
diff --git a/northbridge/intel/i440bxemulation/i440bx.c b/northbridge/intel/i440bxemulation/i440bx.c
index 1e20f4597d..2253163db6 100644
--- a/northbridge/intel/i440bxemulation/i440bx.c
+++ b/northbridge/intel/i440bxemulation/i440bx.c
@@ -41,7 +41,7 @@ static void i440bxemulation_enable_dev(struct device *dev)
 		pci_set_method(dev);
         }
  */
-	printk(BIOS_INFO, "%s: DONE\n", __FUNCTION__);
+	printk(BIOS_INFO, "%s: Done.\n", __FUNCTION__);
 }
 
 struct chip_operations northbridge_intel_i440bxemulation_ops = {