diff --git a/Kconfig b/Kconfig
index 1634fe246a..e5378992ee 100644
--- a/Kconfig
+++ b/Kconfig
@@ -36,7 +36,8 @@ source mainboard/Kconfig
 source arch/Kconfig
 source lib/Kconfig
 source console/Kconfig
-# these are used for internal purposes only
+
+# These are used for internal purposes only.
 source northbridge/Kconfig
 source southbridge/Kconfig
 source superio/Kconfig
diff --git a/arch/Kconfig b/arch/Kconfig
index 01d3db86ea..ee89d152f3 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -19,10 +19,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-#
 # Source all architectures.
-#
-
 source arch/x86/Kconfig
 source arch/powerpc/Kconfig
 
diff --git a/mainboard/emulation/qemu-x86/dts b/mainboard/emulation/qemu-x86/dts
index 9969490116..f9bf78b491 100644
--- a/mainboard/emulation/qemu-x86/dts
+++ b/mainboard/emulation/qemu-x86/dts
@@ -37,7 +37,7 @@
 			pcipath = "0,0";
 			enabled;
 		};
- */
+*/
 	};
 
 };
diff --git a/mainboard/emulation/qemu-x86/vga.c b/mainboard/emulation/qemu-x86/vga.c
index d23e92a06e..421dc4dcc4 100644
--- a/mainboard/emulation/qemu-x86/vga.c
+++ b/mainboard/emulation/qemu-x86/vga.c
@@ -30,16 +30,16 @@
 static void setup_onboard(struct device *dev)
 {
 	struct pc_keyboard conf;
+
 	printk(BIOS_INFO, "Init VGA device\n");
-	dev->on_mainboard=1;
-	dev->rom_address=0xc0000;
+	dev->on_mainboard = 1;
+	dev->rom_address = 0xc0000;
 
 	// FIXME - this should be in superio some day
 	// but since qemu has no superio.
 	init_pc_keyboard(0x60, 0x64, &conf);
 }
 
-
 static struct device_operations qemuvga_pci_ops_dev = {
 	.constructor		 = default_device_constructor,
 	.phase3_scan		 = 0,
@@ -54,6 +54,6 @@ static struct device_operations qemuvga_pci_ops_dev = {
 struct constructor qemuvga_constructors[] = {
 	{.id = {.type = DEVICE_ID_PCI,
 		.u = {.pci = {.vendor = 0x1013,.device = 0x00b8}}},
-		&qemuvga_pci_ops_dev},
+	 &qemuvga_pci_ops_dev},
 	{.ops = 0},
 };
diff --git a/northbridge/intel/Kconfig b/northbridge/intel/Kconfig
index aa2ddb42f4..be8b6337a8 100644
--- a/northbridge/intel/Kconfig
+++ b/northbridge/intel/Kconfig
@@ -23,6 +23,5 @@ config NORTHBRIDGE_INTEL_I440BXEMULATION
 	boolean
 	help
 	  This option is internally used to decide which northbridge code to
-	  use. It is set in the mainboard Kconfig
-
+	  use. It is set in the mainboard Kconfig file.
 
diff --git a/northbridge/intel/Makefile b/northbridge/intel/Makefile
index cf6e3a446a..01204e21ad 100644
--- a/northbridge/intel/Makefile
+++ b/northbridge/intel/Makefile
@@ -20,6 +20,6 @@
 ##
 
 ifdef CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION
-  include $(src)/northbridge/intel/i440bxemulation/Makefile
+	include $(src)/northbridge/intel/i440bxemulation/Makefile
 endif
 
diff --git a/southbridge/intel/Kconfig b/southbridge/intel/Kconfig
index 57206b78d9..234fc196e7 100644
--- a/southbridge/intel/Kconfig
+++ b/southbridge/intel/Kconfig
@@ -23,5 +23,5 @@ config SOUTHBRIDGE_INTEL_I82371EB
 	boolean
 	help
 	  This option is internally used to decide which southbridge code to
-	  use. It is set in the mainboard Kconfig
+	  use. It is set in the mainboard Kconfig file.
 
diff --git a/southbridge/intel/Makefile b/southbridge/intel/Makefile
index 5ba5e9ee0e..386b9b7b71 100644
--- a/southbridge/intel/Makefile
+++ b/southbridge/intel/Makefile
@@ -19,11 +19,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# one entry like the below for each supported intel southbridge
-
+# One entry like the below for each supported Intel southbridge.
 ifdef CONFIG_SOUTHBRIDGE_INTEL_I82371EB
-  include $(src)/southbridge/intel/i82371eb/Makefile
+	include $(src)/southbridge/intel/i82371eb/Makefile
 endif
 
-
-
diff --git a/southbridge/intel/i82371eb/config.h b/southbridge/intel/i82371eb/config.h
index 7a1ecb5cfd..bc3910b480 100644
--- a/southbridge/intel/i82371eb/config.h
+++ b/southbridge/intel/i82371eb/config.h
@@ -25,5 +25,4 @@ extern struct constructor i82371eb_constructors[];
 struct southbridge_intel_i82371eb_config {
         unsigned int ide0_enable : 1;
         unsigned int ide1_enable : 1;
-
 };
diff --git a/superio/winbond/Kconfig b/superio/winbond/Kconfig
index b0a2ff5dbe..6e8aa479b0 100644
--- a/superio/winbond/Kconfig
+++ b/superio/winbond/Kconfig
@@ -22,6 +22,6 @@
 config SUPERIO_WINBOND_W83627HF
 	boolean
 	help
-	  This option is internally used to decide which southbridge code to
-	  use. It is set in the mainboard Kconfig
+	  This option is internally used to decide which Super I/O code to
+	  use. It is set in the mainboard Kconfig file.
 
diff --git a/superio/winbond/w83627hf/Makefile b/superio/winbond/w83627hf/Makefile
index 00b511e5f3..6b74669f35 100644
--- a/superio/winbond/w83627hf/Makefile
+++ b/superio/winbond/w83627hf/Makefile
@@ -19,8 +19,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# always add to variables, as there could be more than one superio
-
+# Always add to variables, as there could be more than one Super I/O.
 STAGE2_CHIPSET_OBJ += $(obj)/superio/winbond/w83627hf/superio.o
 
 $(obj)/superio/winbond/w83627hf/%.o: $(src)/superio/winbond/w83627hf/%.c
diff --git a/util/Makefile b/util/Makefile
index 422c8faa68..5bd693b1d8 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -23,7 +23,7 @@ include util/dtc/Makefile
 include util/kconfig/Makefile
 include util/lar/Makefile
 
-# parts used by LinuxBIOS
+# Parts used by LinuxBIOS.
 include util/x86emu/Makefile
 
 # Compressors.