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 cbc534cf92ce35b6ee6f37943d685bdc4b1b70d8)
@@ -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 cbc534cf92ce35b6ee6f37943d685bdc4b1b70d8)
@@ -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)
 {