Index: kernel/arch/amd64/include/arch/asm.h
===================================================================
--- kernel/arch/amd64/include/arch/asm.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/amd64/include/arch/asm.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -235,4 +235,5 @@
  *
  * @return Current interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_read(void)
@@ -246,4 +247,5 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_enable(void)
@@ -261,4 +263,5 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_disable(void)
Index: kernel/arch/amd64/src/asm.S
===================================================================
--- kernel/arch/amd64/src/asm.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/amd64/src/asm.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -180,5 +180,5 @@
 		subq $(ISTATE_SOFT_SIZE + 8), %rsp
 	.endif
-
+	
 	/*
 	 * Save the general purpose registers.
@@ -346,5 +346,5 @@
 	swapgs
 	sti
-
+	
 	/* Copy the 4th argument where it is expected  */
 	movq %r10, %rcx
Index: kernel/arch/amd64/src/context.S
===================================================================
--- kernel/arch/amd64/src/context.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/amd64/src/context.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -78,5 +78,5 @@
 	movq CONTEXT_OFFSET_PC(%rdi), %rdx
 	movq %rdx, (%rsp)
-
+	
 	movq CONTEXT_OFFSET_TP(%rdi), %rcx 
 	movq vreg_ptr, %rsi
Index: kernel/arch/arm32/src/asm.S
===================================================================
--- kernel/arch/arm32/src/asm.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/arm32/src/asm.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -101,3 +101,2 @@
 	mov pc, lr
 FUNCTION_END(early_putchar)
-
Index: kernel/arch/arm32/src/context.S
===================================================================
--- kernel/arch/arm32/src/context.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/arm32/src/context.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -58,3 +58,2 @@
 	mov pc, lr
 FUNCTION_END(context_restore_arch)
-
Index: kernel/arch/arm32/src/debug/stacktrace_asm.S
===================================================================
--- kernel/arch/arm32/src/debug/stacktrace_asm.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/arm32/src/debug/stacktrace_asm.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -40,3 +40,2 @@
 	mov pc, lr
 FUNCTION_END(program_counter_get)
-
Index: kernel/arch/arm32/src/eabi.S
===================================================================
--- kernel/arch/arm32/src/eabi.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/arm32/src/eabi.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -90,3 +90,2 @@
 	mov pc, lr
 FUNCTION_END(__aeabi_uldivmod)
-
Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia32/include/arch/asm.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -259,4 +259,5 @@
  *
  * @return Current interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_read(void)
@@ -270,4 +271,5 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_enable(void)
@@ -285,4 +287,5 @@
  *
  * @return Old interrupt priority level.
+ *
  */
 NO_TRACE static inline ipl_t interrupts_disable(void)
Index: kernel/arch/ia32/include/arch/cpuid.h
===================================================================
--- kernel/arch/ia32/include/arch/cpuid.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia32/include/arch/cpuid.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -85,16 +85,16 @@
 	
 	asm volatile (
-		"pushf\n"			/* read flags */
+		"pushf\n"                      /* read flags */
 		"popl %[ret]\n"
 		"movl %[ret], %[val]\n"
 		
-		"xorl %[eflags_id], %[val]\n"	/* swap the ID bit */
+		"xorl %[eflags_id], %[val]\n"  /* swap the ID bit */
 		
-		"pushl %[val]\n"		/* propagate the change into flags */
+		"pushl %[val]\n"               /* propagate the change into flags */
 		"popf\n"
 		"pushf\n"
 		"popl %[val]\n"
 		
-		"andl %[eflags_id], %[ret]\n"	/* interrested only in ID bit */
+		"andl %[eflags_id], %[ret]\n"  /* interrested only in ID bit */
 		"andl %[eflags_id], %[val]\n"
 		"xorl %[val], %[ret]\n"
Index: kernel/arch/ia32/src/context.S
===================================================================
--- kernel/arch/ia32/src/context.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia32/src/context.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -59,5 +59,4 @@
 FUNCTION_END(context_save_arch)
 
-
 ## Restore saved CPU context
 #
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia32/src/ia32.c	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -143,5 +143,4 @@
 		zone_merge_all();
 	}
-
 }
 
Index: kernel/arch/ia32/src/smp/ap.S
===================================================================
--- kernel/arch/ia32/src/smp/ap.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia32/src/smp/ap.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -75,7 +75,7 @@
 	movw %ax, %es
 	movw %ax, %ss
-	movl $KA2PA(ctx), %eax		/* KA2PA((uintptr_t) &ctx) */
+	movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
 	movl CONTEXT_OFFSET_SP(%eax), %esp
-	leal KA2PA(0)(%esp), %esp	/* KA2PA(ctx.sp) */
+	leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 
 	/*
@@ -85,5 +85,5 @@
 	call map_kernel_pse
 	
-	addl $PA2KA(0), %esp		/* PA2KA(ctx.sp) */
+	addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
 	
 	/* create the first stack frame */
Index: kernel/arch/ia64/src/debug/stacktrace_asm.S
===================================================================
--- kernel/arch/ia64/src/debug/stacktrace_asm.S	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/ia64/src/debug/stacktrace_asm.S	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -40,3 +40,2 @@
 	br.ret.sptk.many b0
 FUNCTION_END(program_counter_get)
-
Index: kernel/arch/sparc32/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc32/include/arch/barrier.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/arch/sparc32/include/arch/barrier.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -71,6 +71,8 @@
 
 #ifdef KERNEL
+
 #define smc_coherence(addr)
 #define smc_coherence_block(addr, size)
+
 #endif	/* KERNEL */
 
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/generic/include/adt/list.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -83,5 +83,5 @@
 	for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
 		for (link_t *_link = (list).head.prev; \
-	            iterator = list_get_instance(_link, itype, member), \
+		    iterator = list_get_instance(_link, itype, member), \
 		    _link != &(list).head; _link = _link->prev)
 
Index: kernel/generic/src/adt/btree.c
===================================================================
--- kernel/generic/src/adt/btree.c	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/generic/src/adt/btree.c	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -1047,5 +1047,6 @@
 /** Return number of B-tree elements.
  *
- * @param t    B-tree to count.
+ * @param t B-tree to count.
+ *
  * @return Return number of B-tree elements.
  *
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/generic/src/console/kconsole.c	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -166,5 +166,5 @@
 const char *cmdtab_enum(const char *name, const char **h, void **ctx)
 {
-	link_t **startpos = (link_t**)ctx;
+	link_t **startpos = (link_t**) ctx;
 	size_t namelen = str_length(name);
 	
@@ -183,7 +183,7 @@
 		if (str_lcmp(curname, name, namelen) == 0) {
 			*startpos = (*startpos)->next;
-			if (h) {
+			if (h)
 				*h = hlp->description;
-			}
+			
 			spinlock_unlock(&cmd_lock);
 			return (curname + str_lsize(curname, namelen));
@@ -249,5 +249,4 @@
 			
 			if (continue_showing_hints) {
-				
 				if (help)
 					printf("%s%s (%s)\n", name, hint, help);
@@ -292,5 +291,7 @@
 	while (isspace(cmdline[start]))
 		start++;
+	
 	end = start + 1;
+	
 	while (!isspace(cmdline[end]))
 		end++;
@@ -374,7 +375,5 @@
 				for (beg = position - 1;
 				    (beg > 0) && (!isspace(current[beg]));
-				    beg--) {
-					;
-				}
+				    beg--);
 				
 				if (isspace(current[beg]))
@@ -395,7 +394,8 @@
 					sp = false;
 			}
+			
 			if (narg && isspace(current[0]))
 				narg--;
-
+			
 			int found;
 			if (narg == 0) {
Index: kernel/test/test.c
===================================================================
--- kernel/test/test.c	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/test/test.c	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -69,9 +69,9 @@
 };
 
-const char* tests_hints_enum(const char *input, const char **help,
+const char *tests_hints_enum(const char *input, const char **help,
     void **ctx)
 {
 	size_t len = str_length(input);
-	test_t **test = (test_t**)ctx;
+	test_t **test = (test_t **) ctx;
 	
 	if (*test == NULL)
Index: kernel/test/test.h
===================================================================
--- kernel/test/test.h	(revision 8f9c8087039b1242df4ef45ebfc16815cedfcfba)
+++ kernel/test/test.h	(revision bdfdc51cf6c5f6efd8f390b380b3a7ea368992af)
@@ -85,5 +85,5 @@
 extern test_t tests[];
 
-extern const char* tests_hints_enum(const char *, const char **, void **);
+extern const char *tests_hints_enum(const char *, const char **, void **);
 
 #endif