Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/src/main/kinit.c	(revision 1ba41c5ae41f66c7fa3ef1caef4b77d414202fb3)
@@ -99,5 +99,6 @@
 		 * Just a beautification.
 		 */
-		if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true))) {
+		if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED,
+		    "kmp", true))) {
 			spinlock_lock(&t->lock);
 			t->cpu = &cpus[0];
@@ -124,5 +125,6 @@
 		for (i = 0; i < config.cpu_count; i++) {
 
-			if ((t = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true))) {
+			if ((t = thread_create(kcpulb, NULL, TASK,
+			    THREAD_FLAG_WIRED, "kcpulb", true))) {
 				spinlock_lock(&t->lock);			
 				t->cpu = &cpus[i];
@@ -144,5 +146,6 @@
 	 * Create kernel console.
 	 */
-	if ((t = thread_create(kconsole, "kconsole", TASK, 0, "kconsole", false)))
+	t = thread_create(kconsole, "kconsole", TASK, 0, "kconsole", false);
+	if (t)
 		thread_ready(t);
 	else
@@ -162,15 +165,18 @@
 		}
 
-		task_t *utask = task_run_program((void *) init.tasks[i].addr, "uspace");
+		task_t *utask = task_run_program((void *) init.tasks[i].addr,
+		    "uspace");
 		if (utask) {
 			/*
 			 * Set capabilities to init userspace tasks.
 			 */
-			cap_set(utask, CAP_CAP | CAP_MEM_MANAGER | CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
+			cap_set(utask, CAP_CAP | CAP_MEM_MANAGER |
+			    CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
 			
 			if (!ipc_phone_0) 
 				ipc_phone_0 = &utask->answerbox;
 		} else {
-			int rd = init_rd((rd_header *) init.tasks[i].addr, init.tasks[i].size);
+			int rd = init_rd((rd_header *) init.tasks[i].addr,
+			    init.tasks[i].size);
 			
 			if (rd != RE_OK)
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/src/main/main.c	(revision 1ba41c5ae41f66c7fa3ef1caef4b77d414202fb3)
@@ -147,5 +147,5 @@
 	
 	config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
-		hardcoded_kdata_size, PAGE_SIZE);
+	    hardcoded_kdata_size, PAGE_SIZE);
 	config.stack_size = CONFIG_STACK_SIZE;
 	
@@ -157,7 +157,7 @@
 	for (i = 0; i < init.cnt; i++) {
 		if (PA_overlaps(config.stack_base, config.stack_size,
-			init.tasks[i].addr, init.tasks[i].size))
+		    init.tasks[i].addr, init.tasks[i].size))
 			config.stack_base = ALIGN_UP(init.tasks[i].addr +
-				init.tasks[i].size, config.stack_size);
+			    init.tasks[i].size, config.stack_size);
 	}
 
@@ -165,7 +165,7 @@
 	if (ballocs.size) {
 		if (PA_overlaps(config.stack_base, config.stack_size,
-			ballocs.base, ballocs.size))
+		    ballocs.base, ballocs.size))
 			config.stack_base = ALIGN_UP(ballocs.base +
-				ballocs.size, PAGE_SIZE);
+			    ballocs.size, PAGE_SIZE);
 	}
 	
@@ -175,5 +175,5 @@
 	context_save(&ctx);
 	context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
-		THREAD_STACK_SIZE);
+	    THREAD_STACK_SIZE);
 	context_restore(&ctx);
 	/* not reached */
@@ -223,9 +223,9 @@
 	version_print();
 	printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
-		"hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
-		config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >>
-		10);
+	    "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
+	    config.base, hardcoded_ktext_size >> 10,
+	    hardcoded_kdata_size >> 10);
 	printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
-		config.stack_base, config.stack_size >> 10);
+	    config.stack_base, config.stack_size >> 10);
 
 	arch_pre_smp_init();
@@ -250,6 +250,6 @@
 		for (i = 0; i < init.cnt; i++)
 			printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i,
-				sizeof(uintptr_t) * 2, init.tasks[i].addr, i,
-				init.tasks[i].size);
+			    sizeof(uintptr_t) * 2, init.tasks[i].addr, i,
+			    init.tasks[i].size);
 	} else
 		printf("No init binaries found\n");
@@ -324,5 +324,5 @@
 	 */
 	context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
-		(uintptr_t) CPU->stack, CPU_STACK_SIZE);
+	    (uintptr_t) CPU->stack, CPU_STACK_SIZE);
 	context_restore(&CPU->saved_context);
 	/* not reached */
Index: kernel/generic/src/main/uinit.c
===================================================================
--- kernel/generic/src/main/uinit.c	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/src/main/uinit.c	(revision 1ba41c5ae41f66c7fa3ef1caef4b77d414202fb3)
@@ -49,5 +49,6 @@
 /** Thread used to bring up userspace thread.
  *
- * @param arg Pointer to structure containing userspace entry and stack addresses.
+ * @param arg Pointer to structure containing userspace entry and stack
+ *     addresses.
  */
 void uinit(void *arg)