Index: uspace/lib/c/arch/mips32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/tls.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/c/arch/mips32/include/libarch/tls.h	(revision 1cac8753dba1dcd1e470087cba35d1d4f93975a2)
@@ -69,12 +69,12 @@
 	tp += MIPS_TP_OFFSET + sizeof(tcb_t);
 
-	asm volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */
+	asm volatile ("add $27, %0, $0" : : "r" (tp)); /* Move tls to K1 */
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
-	void * retval;
+	void *retval;
 
-	asm volatile("add %0, $27, $0" : "=r"(retval));
+	asm volatile ("add %0, $27, $0" : "=r" (retval));
 
 	return (tcb_t *)(retval - MIPS_TP_OFFSET - sizeof(tcb_t));
Index: uspace/lib/c/arch/sparc64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/c/arch/sparc64/include/libarch/syscall.h	(revision 1cac8753dba1dcd1e470087cba35d1d4f93975a2)
@@ -60,9 +60,9 @@
 
 	asm volatile (
-		"ta %7\n"
-		: "=r" (a1)
-		: "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
-		  "i" (id)
-		: "memory"
+	    "ta %7\n"
+	    : "=r" (a1)
+	    : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
+	      "i" (id)
+	    : "memory"
 	);
 
Index: uspace/lib/c/generic/adt/odict.c
===================================================================
--- uspace/lib/c/generic/adt/odict.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/c/generic/adt/odict.c	(revision 1cac8753dba1dcd1e470087cba35d1d4f93975a2)
@@ -75,5 +75,5 @@
 	printf("[%p/%c", cur, cur->color == odc_red ? 'r' : 'b');
 	if (cur->a != NULL || cur->b != NULL) {
-		putchar(' ' );
+		putchar(' ');
 		odict_print_tree(cur->a);
 		putchar(',');
@@ -254,5 +254,5 @@
 			if (cur->a == NULL) {
 				odict_link_child_a(odlink, cur);
-	    			break;
+				break;
 			}
 			cur = cur->a;
@@ -923,9 +923,22 @@
 		b->b->up = a;
 
-	/* Swap links going out of A and out of B */
-	n = a->up; a->up = b->up; b->up = n;
-	n = a->a; a->a = b->a; b->a = n;
-	n = a->b; a->b = b->b; b->b = n;
-	c = a->color; a->color = b->color; b->color = c;
+	/*
+	 * Swap links going out of A and out of B
+	 */
+	n = a->up;
+	a->up = b->up;
+	b->up = n;
+
+	n = a->a;
+	a->a = b->a;
+	b->a = n;
+
+	n = a->b;
+	a->b = b->b;
+	b->b = n;
+
+	c = a->color;
+	a->color = b->color;
+	b->color = c;
 
 	/* When A and B are adjacent, fix self-loops that might have arisen */
Index: uspace/lib/c/generic/fibril_synch.c
===================================================================
--- uspace/lib/c/generic/fibril_synch.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/c/generic/fibril_synch.c	(revision 1cac8753dba1dcd1e470087cba35d1d4f93975a2)
@@ -354,5 +354,5 @@
 
 errno_t
-    fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
+fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
     suseconds_t timeout)
 {
Index: uspace/lib/c/include/assert.h
===================================================================
--- uspace/lib/c/include/assert.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/c/include/assert.h	(revision 1cac8753dba1dcd1e470087cba35d1d4f93975a2)
@@ -64,7 +64,7 @@
 
 #ifndef NDEBUG
-	#define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
+#define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
 #else
-	#define assert(expr) ((void) 0)
+#define assert(expr) ((void) 0)
 #endif
 
@@ -74,7 +74,7 @@
 
 #ifndef NDEBUG
-	#define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
+#define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
 #else
-	#define safe_assert(expr) ((void) 0)
+#define safe_assert(expr) ((void) 0)
 #endif