Index: kernel/arch/ia32/src/boot/cboot.c
===================================================================
--- kernel/arch/ia32/src/boot/cboot.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/arch/ia32/src/boot/cboot.c	(revision 2f5769097aeb16476c39a32de0fe53503cf28a83)
@@ -47,7 +47,8 @@
 /** Extract command name from the multiboot module command line.
  *
- * @param buf		Destination buffer (will always null-terminate).
- * @param n		Size of destination buffer.
- * @param cmd_line	Input string (the command line).			
+ * @param buf      Destination buffer (will always null-terminate).
+ * @param n        Size of destination buffer.
+ * @param cmd_line Input string (the command line).
+ *
  */
 static void extract_command(char *buf, size_t n, const char *cmd_line)
@@ -55,9 +56,10 @@
 	const char *start, *end, *cp;
 	size_t max_len;
-
+	
 	/* Find the first space. */
 	end = strchr(cmd_line, ' ');
-	if (end == NULL) end = cmd_line + strlen(cmd_line);
-
+	if (end == NULL)
+		end = cmd_line + strlen(cmd_line);
+	
 	/*
 	 * Find last occurence of '/' before 'end'. If found, place start at
@@ -73,5 +75,5 @@
 		--cp;
 	}
-
+	
 	/* Copy the command and null-terminate the string. */
 	max_len = min(n - 1, (size_t) (end - start));
@@ -81,6 +83,7 @@
 
 /** C part of ia32 boot sequence.
- * @param signature	Should contain the multiboot signature.
- * @param mi		Pointer to the multiboot information structure.
+ *
+ * @param signature Should contain the multiboot signature.
+ * @param mi        Pointer to the multiboot information structure.
  */
 void ia32_cboot(uint32_t signature, const mb_info_t *mi)
@@ -89,22 +92,22 @@
 	mb_mod_t *mods;
 	uint32_t i;
-
-	if (signature == MULTIBOOT_LOADER_MAGIC) {
+	
+	if (signature == MULTIBOOT_LOADER_MAGIC)
 		flags = mi->flags;
-	} else {
+	else {
 		/* No multiboot info available. */
 		flags = 0;
 	}
-
+	
 	/* Copy module information. */
-
+	
 	if ((flags & MBINFO_FLAGS_MODS) != 0) {
 		init.cnt = mi->mods_count;
 		mods = mi->mods_addr;
-
+		
 		for (i = 0; i < init.cnt; i++) {
 			init.tasks[i].addr = mods[i].start + 0x80000000;
 			init.tasks[i].size = mods[i].end - mods[i].start;
-
+			
 			/* Copy command line, if available. */
 			if (mods[i].string) {
@@ -112,27 +115,25 @@
 				    CONFIG_TASK_NAME_BUFLEN,
 				    mods[i].string);
-			} else {
+			} else
 				init.tasks[i].name[0] = '\0';
-			}
 		}
-	} else {
+	} else
 		init.cnt = 0;
-	}
-
+	
 	/* Copy memory map. */
-
+	
 	int32_t mmap_length;
 	mb_mmap_t *mme;
 	uint32_t size;
-
+	
 	if ((flags & MBINFO_FLAGS_MMAP) != 0) {
 		mmap_length = mi->mmap_length;
 		mme = mi->mmap_addr;
 		e820counter = 0;
-
+		
 		i = 0;
 		while (mmap_length > 0) {
 			e820table[i++] = mme->mm_info;
-
+			
 			/* Compute address of next structure. */
 			size = sizeof(mme->size) + mme->size;
@@ -140,10 +141,9 @@
 			mmap_length -= size;
 		}
-
+		
 		e820counter = i;
-	} else {
+	} else
 		e820counter = 0;
-	}
-
+	
 #ifdef CONFIG_SMP
 	/* Copy AP bootstrap routines below 1 MB. */
@@ -151,5 +151,5 @@
 	    (size_t) &_hardcoded_unmapped_size);
 #endif
-
+	
 	main_bsp();
 }
Index: kernel/generic/include/string.h
===================================================================
--- kernel/generic/include/string.h	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/include/string.h	(revision 2f5769097aeb16476c39a32de0fe53503cf28a83)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
Index: kernel/generic/src/lib/string.c
===================================================================
--- kernel/generic/src/lib/string.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/src/lib/string.c	(revision 2f5769097aeb16476c39a32de0fe53503cf28a83)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -33,5 +33,5 @@
 /**
  * @file
- * @brief	Miscellaneous functions.
+ * @brief Miscellaneous functions.
  */
 
@@ -48,4 +48,5 @@
  *
  * @return Number of characters in str.
+ *
  */
 size_t strlen(const char *str)
@@ -53,6 +54,5 @@
 	int i;
 	
-	for (i = 0; str[i]; i++)
-		;
+	for (i = 0; str[i]; i++);
 	
 	return i;
@@ -81,6 +81,8 @@
 	if (*src == *dst)
 		return 0;
+	
 	if (!*src)
 		return -1;
+	
 	return 1;
 }
@@ -108,11 +110,15 @@
 		if (*src < *dst)
 			return -1;
+		
 		if (*src > *dst)
 			return 1;
 	}
+	
 	if (i == len || *src == *dst)
 		return 0;
+	
 	if (!*src)
 		return -1;
+	
 	return 1;
 }
@@ -126,17 +132,18 @@
  * last copied character.
  *
- * @param src Source string.
+ * @param src  Source string.
  * @param dest Destination buffer.
- * @param len Size of destination buffer.
+ * @param len  Size of destination buffer.
+ *
  */
 void strncpy(char *dest, const char *src, size_t len)
 {
 	unsigned int i;
-
+	
 	for (i = 0; i < len; i++) {
 		if (!(dest[i] = src[i]))
 			return;
 	}
-
+	
 	dest[i - 1] = '\0';
 }
@@ -144,16 +151,17 @@
 /** Find first occurence of character in string.
  *
- * @param s	String to search.
- * @param i	Character to look for.
+ * @param s String to search.
+ * @param i Character to look for.
  *
- * @return	Pointer to character in @a s or NULL if not found.
+ * @return Pointer to character in @a s or NULL if not found.
  */
 extern char *strchr(const char *s, int i)
 {
 	while (*s != '\0') {
-		if (*s == i) return (char *) s;
+		if (*s == i)
+			return (char *) s;
 		++s;
 	}
-
+	
 	return NULL;
 }
Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
+++ kernel/generic/src/main/kinit.c	(revision 2f5769097aeb16476c39a32de0fe53503cf28a83)
@@ -33,5 +33,5 @@
 /**
  * @file
- * @brief	Kernel initialization thread.
+ * @brief Kernel initialization thread.
  *
  * This file contains kinit kernel thread which carries out
@@ -81,6 +81,6 @@
 #endif
 
-#define BOOT_PREFIX		"boot:"
-#define BOOT_PREFIX_LEN		5
+#define BOOT_PREFIX      "boot:"
+#define BOOT_PREFIX_LEN  5
 
 /** Kernel initialization thread.
@@ -98,13 +98,13 @@
 	thread_t *thread;
 #endif
-
+	
 	/*
 	 * Detach kinit as nobody will call thread_join_timeout() on it.
 	 */
 	thread_detach(THREAD);
-
+	
 	interrupts_disable();
-
-#ifdef CONFIG_SMP		 	
+	
+#ifdef CONFIG_SMP
 	if (config.cpu_count > 1) {
 		waitq_initialize(&ap_completion_wq);
@@ -126,7 +126,5 @@
 		thread_detach(thread);
 	}
-#endif /* CONFIG_SMP */
-	
-#ifdef CONFIG_SMP
+	
 	if (config.cpu_count > 1) {
 		count_t i;
@@ -144,5 +142,4 @@
 			} else
 				printf("Unable to create kcpulb thread for cpu" PRIc "\n", i);
-
 		}
 	}
@@ -153,5 +150,5 @@
 	 */
 	arch_post_smp_init();
-
+	
 #ifdef CONFIG_KCONSOLE
 	if (stdin) {
@@ -180,15 +177,17 @@
 			continue;
 		}
-
+		
 		/*
 		 * Construct task name from the 'boot:' prefix and the
 		 * name stored in the init structure (if any).
 		 */
-
-		char namebuf[TASK_NAME_BUFLEN], *name;
-
+		
+		char namebuf[TASK_NAME_BUFLEN];
+		char *name;
+		
 		name = init.tasks[i].name;
-		if (name[0] == '\0') name = "<unknown>";
-
+		if (name[0] == '\0')
+			name = "<unknown>";
+		
 		ASSERT(TASK_NAME_BUFLEN >= BOOT_PREFIX_LEN);
 		strncpy(namebuf, BOOT_PREFIX, TASK_NAME_BUFLEN);
@@ -234,5 +233,5 @@
 		}
 	}
-
+	
 #ifdef CONFIG_KCONSOLE
 	if (!stdin) {