Index: kernel/arch/abs32le/include/arch/mm/page.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/page.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/arch/abs32le/include/arch/mm/page.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -152,6 +152,5 @@
 	pte_t *p = &pt[i];
 
-	return (
-	    ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+	return (((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
 	    ((unsigned int) (!p->present) << PAGE_PRESENT_SHIFT) |
 	    ((unsigned int) p->uaccessible << PAGE_USER_SHIFT) |
@@ -159,6 +158,5 @@
 	    ((unsigned int) p->writeable << PAGE_WRITE_SHIFT) |
 	    (1 << PAGE_EXEC_SHIFT) |
-	    ((unsigned int) p->global << PAGE_GLOBAL_SHIFT)
-	);
+	    ((unsigned int) p->global << PAGE_GLOBAL_SHIFT));
 }
 
Index: kernel/arch/arm32/include/arch/cycle.h
===================================================================
--- kernel/arch/arm32/include/arch/cycle.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -52,7 +52,10 @@
 	if ((ID_PFR1_read() & ID_PFR1_GEN_TIMER_EXT_MASK) ==
 	    ID_PFR1_GEN_TIMER_EXT) {
-	    uint32_t low = 0, high = 0;
-	    asm volatile( "MRRC p15, 0, %[low], %[high], c14": [low]"=r"(low), [high]"=r"(high));
-	   return ((uint64_t)high << 32) | low;
+		uint32_t low = 0, high = 0;
+		asm volatile (
+		    "MRRC p15, 0, %[low], %[high], c14"
+		    : [low] "=r" (low), [high] "=r" (high)
+		);
+		return ((uint64_t)high << 32) | low;
 	} else {
 		return (uint64_t)PMCCNTR_read() * 64;
Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -245,5 +245,6 @@
 void icp_cpu_halt(void)
 {
-	while (true);
+	while (true)
+		;
 }
 
@@ -345,11 +346,11 @@
 
 #ifdef CONFIG_PL011_UART
-        srln_instance_t *srln_instance = srln_init();
-        if (srln_instance) {
-                indev_t *sink = stdin_wire();
-                indev_t *srln = srln_wire(srln_instance, sink);
-                pl011_uart_input_wire(&icp.uart, srln);
-                icp_irqc_unmask(ICP_UART0_IRQ);
-        }
+	srln_instance_t *srln_instance = srln_init();
+	if (srln_instance) {
+		indev_t *sink = stdin_wire();
+		indev_t *srln = srln_wire(srln_instance, sink);
+		pl011_uart_input_wire(&icp.uart, srln);
+		icp_irqc_unmask(ICP_UART0_IRQ);
+	}
 #endif
 }
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/arch/ia64/src/mm/page.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -75,5 +75,5 @@
 	 * For paranoia reasons, we set it again.
 	 */
-	for(i = 0; i < REGION_REGISTERS; i++) {
+	for (i = 0; i < REGION_REGISTERS; i++) {
 		rr.word = rr_read(i);
 		rr.map.ve = 0;		/* disable VHPT walker */
Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -152,5 +152,5 @@
  */
 static inline uint64_t
-    __hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number)
 {
@@ -187,5 +187,5 @@
  */
 static inline uint64_t
-    __hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number,
     uint64_t *ret1)
@@ -223,5 +223,5 @@
  */
 static inline uint64_t
-    __hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t sw_trap_number)
 {
Index: kernel/genarch/src/drivers/am335x/timer.c
===================================================================
--- kernel/genarch/src/drivers/am335x/timer.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/genarch/src/drivers/am335x/timer.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -47,11 +47,11 @@
 
 typedef struct timer_regs_mmap {
-        uintptr_t base;
-        size_t size;
+	uintptr_t base;
+	size_t size;
 } timer_regs_mmap_t;
 
 static const timer_regs_mmap_t regs_map[TIMERS_MAX] = {
 	{ .base = AM335x_DMTIMER0_BASE_ADDRESS, .size = AM335x_DMTIMER0_SIZE },
-	{0, 0}, /* DMTIMER1 is not supported by this driver */
+	{ 0, 0 }, /* DMTIMER1 is not supported by this driver */
 	{ .base = AM335x_DMTIMER2_BASE_ADDRESS, .size = AM335x_DMTIMER2_SIZE },
 	{ .base = AM335x_DMTIMER3_BASE_ADDRESS, .size = AM335x_DMTIMER3_SIZE },
@@ -67,5 +67,6 @@
 	am335x_timer_regs_t *regs = timer->regs;
 
-	while (regs->twps & reg);
+	while (regs->twps & reg)
+		;
 
 	switch (reg) {
@@ -149,5 +150,6 @@
 	timer->regs->tiocp_cfg |= AM335x_TIMER_TIOCPCFG_SOFTRESET_FLAG;
 	/* Wait until the reset is done */
-	while (timer->regs->tiocp_cfg & AM335x_TIMER_TIOCPCFG_SOFTRESET_FLAG);
+	while (timer->regs->tiocp_cfg & AM335x_TIMER_TIOCPCFG_SOFTRESET_FLAG)
+		;
 }
 
Index: kernel/generic/src/adt/avl.c
===================================================================
--- kernel/generic/src/adt/avl.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/adt/avl.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -308,5 +308,5 @@
  */
 static int
-    repair(avltree_t *t, avltree_node_t *u, avltree_node_t *v, avltree_node_t *w,
+repair(avltree_t *t, avltree_node_t *u, avltree_node_t *v, avltree_node_t *w,
     int *dir, int ro)
 {
Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/interrupt/interrupt.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -165,6 +165,6 @@
 }
 
-static NO_TRACE
-void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
+static NO_TRACE void
+fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
 	printf("Task %s (%" PRIu64 ") killed due to an exception at "
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/ipc/sysipc.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -765,5 +765,5 @@
 
 	if (!call) {
-		ipc_data_t data = {};
+		ipc_data_t data = { };
 		data.cap_handle = CAP_NIL;
 		STRUCT_TO_USPACE(calldata, &data);
Index: kernel/generic/src/mm/km.c
===================================================================
--- kernel/generic/src/mm/km.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/mm/km.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -263,5 +263,5 @@
 		}
 	} else {
-lowmem:
+	lowmem:
 		frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
 		if (!frame)
Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/proc/scheduler.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -430,5 +430,5 @@
 		case Exiting:
 			rcu_thread_exiting();
-repeat:
+		repeat:
 			if (THREAD->detached) {
 				thread_destroy(THREAD, false);
Index: kernel/generic/src/synch/rcu.c
===================================================================
--- kernel/generic/src/synch/rcu.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ kernel/generic/src/synch/rcu.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -253,5 +253,5 @@
 static void synch_complete(rcu_item_t *rcu_item);
 static inline void rcu_call_impl(bool expedite, rcu_item_t *rcu_item,
-	rcu_func_t func);
+    rcu_func_t func);
 static void add_barrier_cb(void *arg);
 static void barrier_complete(rcu_item_t *barrier_item);
@@ -440,10 +440,10 @@
 {
 	for (unsigned int cpu_id = 0; cpu_id < config.cpu_count; ++cpu_id) {
-		char name[THREAD_NAME_BUFLEN] = {0};
+		char name[THREAD_NAME_BUFLEN] = { 0 };
 
 		snprintf(name, THREAD_NAME_BUFLEN - 1, "rcu-rec/%u", cpu_id);
 
 		cpus[cpu_id].rcu.reclaimer_thr =
-			thread_create(reclaimer, NULL, TASK, THREAD_FLAG_NONE, name);
+		    thread_create(reclaimer, NULL, TASK, THREAD_FLAG_NONE, name);
 
 		if (!cpus[cpu_id].rcu.reclaimer_thr)
@@ -461,5 +461,5 @@
 {
 	rcu.detector_thr =
-		thread_create(detector, NULL, TASK, THREAD_FLAG_NONE, "rcu-det");
+	    thread_create(detector, NULL, TASK, THREAD_FLAG_NONE, "rcu-det");
 
 	if (!rcu.detector_thr)
@@ -656,5 +656,5 @@
 /** rcu_call() inline-able implementation. See rcu_call() for comments. */
 static inline void rcu_call_impl(bool expedite, rcu_item_t *rcu_item,
-	rcu_func_t func)
+    rcu_func_t func)
 {
 	assert(rcu_item);
@@ -667,6 +667,6 @@
 	rcu_cpu_data_t *r = &CPU->rcu;
 
-	rcu_item_t **prev_tail
-		= local_atomic_exchange(&r->parriving_cbs_tail, &rcu_item->next);
+	rcu_item_t **prev_tail =
+	    local_atomic_exchange(&r->parriving_cbs_tail, &rcu_item->next);
 	*prev_tail = rcu_item;
 
@@ -829,5 +829,5 @@
 	if (0 < arriving_cnt) {
 		CPU->rcu.stat_avg_cbs =
-			(99 * CPU->rcu.stat_avg_cbs + 1 * arriving_cnt) / 100;
+		    (99 * CPU->rcu.stat_avg_cbs + 1 * arriving_cnt) / 100;
 	}
 }
@@ -853,6 +853,6 @@
 	 * or risk exhausting all system memory.
 	 */
-	bool expedite = (EXPEDITE_THRESHOLD < CPU->rcu.next_cbs_cnt)
-		|| CPU->rcu.expedite_arriving;
+	bool expedite = (EXPEDITE_THRESHOLD < CPU->rcu.next_cbs_cnt) ||
+	    CPU->rcu.expedite_arriving;
 	CPU->rcu.expedite_arriving = false;
 
@@ -958,5 +958,5 @@
 			/* Wait for the GP to complete. */
 			errno_t ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock,
-				SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+			    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
 
 			if (ret == EINTR) {
@@ -984,5 +984,5 @@
 	while (!cpu_mask_is_none(reader_cpus)) {
 		/* Give cpus a chance to context switch (a QS) and batch callbacks. */
-		if(!gp_sleep(&expedite))
+		if (!gp_sleep(&expedite))
 			return false;
 
@@ -1015,5 +1015,5 @@
 		errno_t ret = 0;
 		ret = _condvar_wait_timeout_spinlock(&rcu.expedite_now, &rcu.gp_lock,
-			DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);
+		    DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);
 
 		/* rcu.expedite_now was signaled. */
@@ -1145,5 +1145,5 @@
 
 		printf("Bug: thread (id %" PRIu64 " \"%s\") exited while in RCU read"
-			" section.\n", THREAD->tid, THREAD->name);
+		    " section.\n", THREAD->tid, THREAD->name);
 	}
 }
@@ -1207,6 +1207,6 @@
 	 */
 	rcu_gp_t compl_gp = ACCESS_ONCE(rcu.completed_gp);
-	if (CPU->rcu.cur_cbs_gp <= compl_gp
-		&& compl_gp <= CPU->rcu.cur_cbs_gp + UINT32_MAX_HALF) {
+	if (CPU->rcu.cur_cbs_gp <= compl_gp &&
+	    compl_gp <= CPU->rcu.cur_cbs_gp + UINT32_MAX_HALF) {
 		*completed_gp = compl_gp;
 		return true;
@@ -1237,5 +1237,5 @@
 	 */
 	if (expedite) {
-		if(0 == rcu.req_expedited_cnt)
+		if (0 == rcu.req_expedited_cnt)
 			condvar_signal(&rcu.expedite_now);
 
@@ -1270,5 +1270,5 @@
 	while (rcu.completed_gp < wait_on_gp && !interrupted) {
 		int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock,
-			SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+		    SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
 		interrupted = (ret == EINTR);
 	}
@@ -1330,5 +1330,5 @@
 	while (0 == rcu.req_gp_end_cnt && !interrupted) {
 		int ret = _condvar_wait_timeout_spinlock(&rcu.req_gp_changed,
-			&rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+		    &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
 
 		interrupted = (ret == EINTR);
@@ -1395,5 +1395,5 @@
 		/* minor bug: sleeps for the same duration if woken up spuriously. */
 		ret = _condvar_wait_timeout_spinlock(&rcu.expedite_now, &rcu.gp_lock,
-			DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);
+		    DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);
 	}
 
@@ -1479,5 +1479,5 @@
 	int delaying_cpu_cnt = atomic_get(&rcu.delaying_cpu_cnt);
 
-	for (int i = 0; i < delaying_cpu_cnt; ++i){
+	for (int i = 0; i < delaying_cpu_cnt; ++i) {
 		if (!semaphore_down_interruptable(&rcu.remaining_readers))
 			return false;
@@ -1549,6 +1549,5 @@
 	if (THREAD == rcu.detector_thr) {
 		THREAD->priority = -1;
-	}
-	else if (THREAD == CPU->rcu.reclaimer_thr) {
+	} else if (THREAD == CPU->rcu.reclaimer_thr) {
 		THREAD->priority = -1;
 	}
@@ -1606,5 +1605,5 @@
 
 		printf("Bug: thread (id %" PRIu64 " \"%s\") exited while in RCU read"
-			" section.\n", THREAD->tid, THREAD->name);
+		    " section.\n", THREAD->tid, THREAD->name);
 	}
 }
@@ -1834,12 +1833,12 @@
 
 	printf("Config: expedite_threshold=%d, critical_threshold=%d,"
-		" detect_sleep=%dms, %s\n",
-		EXPEDITE_THRESHOLD, CRITICAL_THRESHOLD, DETECT_SLEEP_MS, algo);
+	    " detect_sleep=%dms, %s\n",
+	    EXPEDITE_THRESHOLD, CRITICAL_THRESHOLD, DETECT_SLEEP_MS, algo);
 	printf("Completed GPs: %" PRIu64 "\n", rcu.completed_gp);
 	printf("Expedited GPs: %zu\n", rcu.stat_expedited_cnt);
 	printf("Delayed GPs:   %zu (cpus w/ still running readers after gp sleep)\n",
-		rcu.stat_delayed_cnt);
+	    rcu.stat_delayed_cnt);
 	printf("Preempt blocked GPs: %zu (waited for preempted readers; "
-		"running or not)\n", rcu.stat_preempt_blocking_cnt);
+	    "running or not)\n", rcu.stat_preempt_blocking_cnt);
 	printf("Smp calls:     %zu\n", rcu.stat_smp_call_cnt);
 
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -51,11 +51,11 @@
 
 static struct option const long_options[] = {
-	{"parents", no_argument, 0, 'p'},
-	{"verbose", no_argument, 0, 'v'},
-	{"mode", required_argument, 0, 'm'},
-	{"help", no_argument, 0, 'h'},
-	{"version", no_argument, 0, 'V'},
-	{"follow", no_argument, 0, 'f'},
-	{0, 0, 0, 0}
+	{ "parents", no_argument, 0, 'p' },
+	{ "verbose", no_argument, 0, 'v' },
+	{ "mode", required_argument, 0, 'm' },
+	{ "help", no_argument, 0, 'h' },
+	{ "version", no_argument, 0, 'V' },
+	{ "follow", no_argument, 0, 'f' },
+	{ 0, 0, 0, 0 }
 };
 
@@ -68,14 +68,14 @@
 		help_cmd_mkdir(HELP_SHORT);
 		printf(
-		"Usage:  %s [options] <path>\n"
-		"Options:\n"
-		"  -h, --help       A short option summary\n"
-		"  -V, --version    Print version information and exit\n"
-		"  -p, --parents    Create needed parents for <path>\n"
-		"  -m, --mode       Set permissions to [mode] (UNUSED)\n"
-		"  -v, --verbose    Be extremely noisy about what is happening\n"
-		"  -f, --follow     Go to the new directory once created\n"
-		"Currently, %s is under development, some options don't work.\n",
-		cmdname, cmdname);
+		    "Usage:  %s [options] <path>\n"
+		    "Options:\n"
+		    "  -h, --help       A short option summary\n"
+		    "  -V, --version    Print version information and exit\n"
+		    "  -p, --parents    Create needed parents for <path>\n"
+		    "  -m, --mode       Set permissions to [mode] (UNUSED)\n"
+		    "  -v, --verbose    Be extremely noisy about what is happening\n"
+		    "  -f, --follow     Go to the new directory once created\n"
+		    "Currently, %s is under development, some options don't work.\n",
+		    cmdname, cmdname);
 	}
 
@@ -202,5 +202,5 @@
 	if (argc < 1) {
 		printf("%s - incorrect number of arguments. Try `%s --help'\n",
-			cmdname, cmdname);
+		    cmdname, cmdname);
 		return CMD_FAILURE;
 	}
@@ -209,6 +209,6 @@
 		if (verbose)
 			printf("%s: creating %s%s\n",
-				cmdname, argv[i],
-				create_parents ? " (and all parents)" : "");
+			    cmdname, argv[i],
+			    create_parents ? " (and all parents)" : "");
 		ret += create_directory(argv[i], create_parents);
 	}
Index: uspace/app/date/date.c
===================================================================
--- uspace/app/date/date.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/app/date/date.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -47,5 +47,5 @@
 static void usage(void);
 
-static int days_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+static int days_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
 int
Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/app/mkexfat/mkexfat.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -123,8 +123,8 @@
 
 static struct option const long_options[] = {
-	{"help", no_argument, 0, 'h'},
-	{"cluster-size", required_argument, 0, 'c'},
-	{"fs-size", required_argument, 0, 's'},
-	{"label", required_argument, 0, 'L' },
+	{ "help", no_argument, 0, 'h' },
+	{ "cluster-size", required_argument, 0, 'c' },
+	{ "fs-size", required_argument, 0, 's' },
+	{ "label", required_argument, 0, 'L' },
 };
 
Index: uspace/app/tester/float/float2.c
===================================================================
--- uspace/app/tester/float/float2.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/app/tester/float/float2.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -209,5 +209,5 @@
 {
 	bool fail = false;
-if (0) {
+#if 0
 	for (unsigned int i = 0; i < OPERANDS; i++) {
 		double res = acos(arguments_acos[i]);
@@ -249,5 +249,5 @@
 		}
 	}
-}
+#endif
 	for (unsigned int i = 0; i < OPERANDS; i++) {
 		double res = atan(arguments_atan[i]);
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/block/ddisk/ddisk.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -198,6 +198,5 @@
 }
 
-static
-errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
+static errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf)
 {
 	fibril_mutex_lock(&ddisk->lock);
@@ -235,7 +234,6 @@
 }
 
-static
-errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
-    size_t size, bool is_read)
+static errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+    void *buf, size_t size, bool is_read)
 {
 	ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg;
Index: uspace/drv/bus/usb/uhci/uhci_batch.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/bus/usb/uhci/uhci_batch.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -53,5 +53,5 @@
 
 /** Transfer batch setup table. */
-static void (*const batch_setup[])(uhci_transfer_batch_t*);
+static void (*const batch_setup[])(uhci_transfer_batch_t *);
 
 /** Destroys uhci_transfer_batch_t structure.
@@ -72,5 +72,5 @@
  * NULL otherwise.
  */
-uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep)
+uhci_transfer_batch_t *uhci_transfer_batch_create(endpoint_t *ep)
 {
 	uhci_transfer_batch_t *uhci_batch =
@@ -99,6 +99,6 @@
 	usb_transfer_batch_t *usb_batch = &uhci_batch->base;
 
-	uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1)
-		/ usb_batch->ep->max_packet_size;
+	uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1) /
+	    usb_batch->ep->max_packet_size;
 
 	if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
@@ -106,10 +106,10 @@
 	}
 
-	const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL)
-		? USB_SETUP_PACKET_SIZE
-		: 0;
-
-	const size_t total_size = (sizeof(td_t) * uhci_batch->td_count)
-	    + sizeof(qh_t) + setup_size;
+	const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ?
+	    USB_SETUP_PACKET_SIZE :
+	    0;
+
+	const size_t total_size = (sizeof(td_t) * uhci_batch->td_count) +
+	    sizeof(qh_t) + setup_size;
 
 	if (dma_buffer_alloc(&uhci_batch->uhci_dma_buffer, total_size)) {
@@ -162,5 +162,5 @@
 	uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep;
 
-	for (size_t i = 0;i < uhci_batch->td_count; ++i) {
+	for (size_t i = 0; i < uhci_batch->td_count; ++i) {
 		if (td_is_active(&uhci_batch->tds[i])) {
 			return false;
@@ -180,6 +180,6 @@
 		}
 
-		batch->transferred_size
-		    += td_act_size(&uhci_batch->tds[i]);
+		batch->transferred_size +=
+		    td_act_size(&uhci_batch->tds[i]);
 		if (td_is_short(&uhci_batch->tds[i]))
 			goto substract_ret;
@@ -235,6 +235,6 @@
 		const size_t packet_size = min(remain_size, mps);
 
-		const td_t *next_td = (td + 1 < uhci_batch->td_count)
-		    ? &uhci_batch->tds[td + 1] : NULL;
+		const td_t *next_td = (td + 1 < uhci_batch->td_count) ?
+		    &uhci_batch->tds[td + 1] : NULL;
 
 		assert(td < uhci_batch->td_count);
@@ -328,6 +328,6 @@
 }
 
-static void (*const batch_setup[])(uhci_transfer_batch_t*) =
-{
+static void (*const batch_setup[])(uhci_transfer_batch_t *) =
+    {
 	[USB_TRANSFER_CONTROL] = batch_control,
 	[USB_TRANSFER_BULK] = batch_data,
Index: uspace/drv/bus/usb/vhc/hub/hub.c
===================================================================
--- uspace/drv/bus/usb/vhc/hub/hub.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/bus/usb/vhc/hub/hub.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -148,6 +148,6 @@
 		 */
 		//if (port->state == HUB_PORT_STATE_DISCONNECTED) {
-			port->state = HUB_PORT_STATE_DISABLED;
-			set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+		port->state = HUB_PORT_STATE_DISABLED;
+		set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
 		//}
 
@@ -343,6 +343,6 @@
 	    port->state == HUB_PORT_STATE_ENABLED ? 1 : 0,
 	    /* Suspend. */
-	    (port->state == HUB_PORT_STATE_SUSPENDED)
-	    || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
+	    (port->state == HUB_PORT_STATE_SUSPENDED) ||
+	    (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
 	    /* Over-current. */
 	    0,
@@ -358,6 +358,5 @@
 	    0,
 	    /* Reserved. */
-	    0, 0, 0, 0, 0, 0
-	    ) << 8;
+	    0, 0, 0, 0, 0, 0) << 8;
 
 	status |= (port->status_change << 16);
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -1013,7 +1013,6 @@
  * @param stop_bits	The number of stop bits used.
  */
-static void
-    ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity,
-    unsigned int *word_length, unsigned int *stop_bits)
+static void ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate,
+    unsigned int *parity, unsigned int *word_length, unsigned int *stop_bits)
 {
 	ns8250_t *data = dev_ns8250(dev);
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -191,13 +191,13 @@
 		} else {
 			usb_log_error("%s: console session already set",
-			   __FUNCTION__);
+			    __FUNCTION__);
 			async_answer_0(icall_handle, ELIMIT);
 		}
 		break;
 	default:
-			usb_log_error("%s: Unknown method: %d.",
-			    __FUNCTION__, (int) method);
-			async_answer_0(icall_handle, EINVAL);
-			break;
+		usb_log_error("%s: Unknown method: %d.",
+		    __FUNCTION__, (int) method);
+		async_answer_0(icall_handle, EINVAL);
+		break;
 	}
 
@@ -236,16 +236,16 @@
 	while (field != NULL) {
 
-		if ((field->usage == USB_HID_LED_NUM_LOCK)
-		    && (kbd_dev->mods & KM_NUM_LOCK)){
+		if ((field->usage == USB_HID_LED_NUM_LOCK) &&
+		    (kbd_dev->mods & KM_NUM_LOCK)) {
 			field->value = 1;
 		}
 
-		if ((field->usage == USB_HID_LED_CAPS_LOCK)
-		    && (kbd_dev->mods & KM_CAPS_LOCK)){
+		if ((field->usage == USB_HID_LED_CAPS_LOCK) &&
+		    (kbd_dev->mods & KM_CAPS_LOCK)) {
 			field->value = 1;
 		}
 
-		if ((field->usage == USB_HID_LED_SCROLL_LOCK)
-		    && (kbd_dev->mods & KM_SCROLL_LOCK)){
+		if ((field->usage == USB_HID_LED_SCROLL_LOCK) &&
+		    (kbd_dev->mods & KM_SCROLL_LOCK)) {
 			field->value = 1;
 		}
@@ -253,5 +253,5 @@
 		field = usb_hid_report_get_sibling(
 		    &hid_dev->report, field, kbd_dev->led_path,
-		USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_OUTPUT);
 	}
@@ -269,5 +269,5 @@
 	usb_log_debug("Output report buffer: %s",
 	    usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size,
-	        0));
+	    0));
 
 	rc = usbhid_req_set_report(
@@ -308,7 +308,7 @@
 static inline int usb_kbd_is_lock(unsigned int key_code)
 {
-	return (key_code == KC_NUM_LOCK
-	    || key_code == KC_SCROLL_LOCK
-	    || key_code == KC_CAPS_LOCK);
+	return (key_code == KC_NUM_LOCK ||
+	    key_code == KC_SCROLL_LOCK ||
+	    key_code == KC_CAPS_LOCK);
 }
 
@@ -437,5 +437,5 @@
 
 	errno_t ret =
-	   usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+	    usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 	if (ret != EOK) {
 		usb_log_error("Failed to append to hid/kbd report path.");
@@ -461,6 +461,5 @@
 		if (field->value != 0) {
 			kbd_dev->keys[i] = field->usage;
-		}
-		else {
+		} else {
 			kbd_dev->keys[i] = 0;
 		}
@@ -469,6 +468,6 @@
 		++i;
 		field = usb_hid_report_get_sibling(
-		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-		        | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+		    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
@@ -742,5 +741,6 @@
 	// FIXME - the fibril_mutex_is_locked may not cause
 	// fibril scheduling
-	while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {}
+	while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {
+	}
 
 	/* Free all buffers. */
Index: uspace/drv/hid/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -184,5 +184,5 @@
 	    hid_dev->report_id, &hid_dev->report,
 	    USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
-	const usb_hid_report_field_t *wheel= get_mouse_axis_move_field(
+	const usb_hid_report_field_t *wheel = get_mouse_axis_move_field(
 	    hid_dev->report_id, &hid_dev->report,
 	    USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
@@ -232,5 +232,5 @@
 	}
 	errno_t ret =
-	   usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
+	    usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
 	if (ret != EOK) {
 		usb_hid_report_path_free(path);
@@ -241,6 +241,6 @@
 
 	usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-	    &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-	    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
+	    &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END |
+	    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
 
 	while (field != NULL) {
@@ -263,6 +263,6 @@
 
 		field = usb_hid_report_get_sibling(
-		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-		    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+		    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
Index: uspace/drv/hid/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -260,6 +260,6 @@
 
 	usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-	    &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-	    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+	    &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END |
+	    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 	    USB_HID_REPORT_TYPE_INPUT);
 
@@ -279,6 +279,6 @@
 
 		field = usb_hid_report_get_sibling(
-		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-		    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+		    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+		    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
Index: uspace/drv/nic/rtl8139/defs.h
===================================================================
--- uspace/drv/nic/rtl8139/defs.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/nic/rtl8139/defs.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -219,5 +219,5 @@
 static inline void rtl8139_regs_unlock(void *io_base)
 {
-	pio_write_8((io_base) + CR9346, RTL8139_REGS_UNLOCKED);
+	pio_write_8(io_base + CR9346, RTL8139_REGS_UNLOCKED);
 }
 
@@ -261,19 +261,19 @@
 /** Transmit status descriptor registers bits */
 enum rtl8139_tsd {
-	TSD_CRS          = (1 << 31),   /**< Carrier Sense Lost */
-	TSD_TABT         = (1 << 30),   /**<  Transmit Abort */
-	TSD_OWC          = (1 << 29),   /**< Out of Window Collision */
-	TSD_CDH          = (1 << 28),   /**< CD Heart Beat */
-	TSD_NCC_SHIFT    = 24,          /**< Collision Count - bit shift */
-	TSD_NCC_SIZE     = 4,           /**< Collision Count - bit size */
-	TSD_NCC_MASK     = (1 << 4)-1,  /**< Collision Count - bit size */
-	TSD_ERTXTH_SHIFT = 16,          /**< Early Tx Threshold - bit shift */
-	TSD_ERTXTH_SIZE  = 6,           /**< Early Tx  Treshold - bit size */
-	TSD_TOK          = (1 << 15),   /**< Transmit OK */
-	TSD_TUN          = (1 << 14),   /**< Transmit FIFO Underrun */
-	TSD_OWN          = (1 << 13),   /**< OWN */
-	TSD_SIZE_SHIFT   = 0,           /**< Size - bit shift */
-	TSD_SIZE_SIZE    = 13,          /**< Size - bit size */
-	TSD_SIZE_MASK    = 0x1fff       /**< Size - bit mask */
+	TSD_CRS          = (1 << 31),    /**< Carrier Sense Lost */
+	TSD_TABT         = (1 << 30),    /**<  Transmit Abort */
+	TSD_OWC          = (1 << 29),    /**< Out of Window Collision */
+	TSD_CDH          = (1 << 28),    /**< CD Heart Beat */
+	TSD_NCC_SHIFT    = 24,           /**< Collision Count - bit shift */
+	TSD_NCC_SIZE     = 4,            /**< Collision Count - bit size */
+	TSD_NCC_MASK     = (1 << 4) - 1, /**< Collision Count - bit size */
+	TSD_ERTXTH_SHIFT = 16,           /**< Early Tx Threshold - bit shift */
+	TSD_ERTXTH_SIZE  = 6,            /**< Early Tx  Treshold - bit size */
+	TSD_TOK          = (1 << 15),    /**< Transmit OK */
+	TSD_TUN          = (1 << 14),    /**< Transmit FIFO Underrun */
+	TSD_OWN          = (1 << 13),    /**< OWN */
+	TSD_SIZE_SHIFT   = 0,            /**< Size - bit shift */
+	TSD_SIZE_SIZE    = 13,           /**< Size - bit size */
+	TSD_SIZE_MASK    = 0x1fff        /**< Size - bit mask */
 };
 
@@ -480,5 +480,5 @@
 /** Mapping of HW version -> version ID */
 extern const struct rtl8139_hwver_map rtl8139_versions[RTL8139_VER_COUNT + 1];
-extern const char* model_names[RTL8139_VER_COUNT];
+extern const char *model_names[RTL8139_VER_COUNT];
 
 /** Size in the frame header while copying from RxFIFO to Rx buffer */
Index: uspace/drv/platform/amdm37x/amdm37x.c
===================================================================
--- uspace/drv/platform/amdm37x/amdm37x.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/platform/amdm37x/amdm37x.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -48,5 +48,5 @@
     void *data, bool write)
 {
-	printf("PIO %s: %p(%p) %#"PRIx64"\n", write ? "WRITE" : "READ",
+	printf("PIO %s: %p(%p) %#" PRIx64 "\n", write ? "WRITE" : "READ",
 	    (place - base) + data, place, val);
 }
@@ -58,59 +58,59 @@
 	errno_t ret = EOK;
 
-	ret = pio_enable((void*)USBHOST_CM_BASE_ADDRESS, USBHOST_CM_SIZE,
-	    (void**)&device->cm.usbhost);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)CORE_CM_BASE_ADDRESS, CORE_CM_SIZE,
-	    (void**)&device->cm.core);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)CLOCK_CONTROL_CM_BASE_ADDRESS,
-		    CLOCK_CONTROL_CM_SIZE, (void**)&device->cm.clocks);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)MPU_CM_BASE_ADDRESS,
-		    MPU_CM_SIZE, (void**)&device->cm.mpu);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)IVA2_CM_BASE_ADDRESS,
-		    IVA2_CM_SIZE, (void**)&device->cm.iva2);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)CLOCK_CONTROL_PRM_BASE_ADDRESS,
-	    CLOCK_CONTROL_PRM_SIZE, (void**)&device->prm.clocks);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)GLOBAL_REG_PRM_BASE_ADDRESS,
-	    GLOBAL_REG_PRM_SIZE, (void**)&device->prm.global);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)AMDM37x_USBTLL_BASE_ADDRESS,
-	    AMDM37x_USBTLL_SIZE, (void**)&device->tll);
-	if (ret != EOK)
-		return ret;
-
-	ret = pio_enable((void*)AMDM37x_UHH_BASE_ADDRESS,
-	    AMDM37x_UHH_SIZE, (void**)&device->uhh);
+	ret = pio_enable((void *)USBHOST_CM_BASE_ADDRESS, USBHOST_CM_SIZE,
+	    (void **)&device->cm.usbhost);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)CORE_CM_BASE_ADDRESS, CORE_CM_SIZE,
+	    (void **)&device->cm.core);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)CLOCK_CONTROL_CM_BASE_ADDRESS,
+	    CLOCK_CONTROL_CM_SIZE, (void **)&device->cm.clocks);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)MPU_CM_BASE_ADDRESS,
+	    MPU_CM_SIZE, (void **)&device->cm.mpu);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)IVA2_CM_BASE_ADDRESS,
+	    IVA2_CM_SIZE, (void **)&device->cm.iva2);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)CLOCK_CONTROL_PRM_BASE_ADDRESS,
+	    CLOCK_CONTROL_PRM_SIZE, (void **)&device->prm.clocks);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)GLOBAL_REG_PRM_BASE_ADDRESS,
+	    GLOBAL_REG_PRM_SIZE, (void **)&device->prm.global);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)AMDM37x_USBTLL_BASE_ADDRESS,
+	    AMDM37x_USBTLL_SIZE, (void **)&device->tll);
+	if (ret != EOK)
+		return ret;
+
+	ret = pio_enable((void *)AMDM37x_UHH_BASE_ADDRESS,
+	    AMDM37x_UHH_SIZE, (void **)&device->uhh);
 	if (ret != EOK)
 		return ret;
 
 	if (trace) {
-		pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
-		pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void*)CORE_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void*)MPU_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void*)IVA2_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void*)USBHOST_CM_BASE_ADDRESS);
-		pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void*)AMDM37x_UHH_BASE_ADDRESS);
-		pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS);
-		pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void*)GLOBAL_REG_PRM_BASE_ADDRESS);
+		pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void *)AMDM37x_USBTLL_BASE_ADDRESS);
+		pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void *)CLOCK_CONTROL_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void *)CORE_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void *)MPU_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void *)IVA2_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void *)USBHOST_CM_BASE_ADDRESS);
+		pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void *)AMDM37x_UHH_BASE_ADDRESS);
+		pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void *)CLOCK_CONTROL_PRM_BASE_ADDRESS);
+		pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void *)GLOBAL_REG_PRM_BASE_ADDRESS);
 	}
 	return EOK;
@@ -129,9 +129,9 @@
 	/* Get SYS_CLK value, it is used as reference clock by all DPLLs,
 	 * NFI who sets this or why it is set to specific value. */
-	const unsigned osc_clk = pio_read_32(&device->prm.clocks->clksel)
-	    & CLOCK_CONTROL_PRM_CLKSEL_SYS_CLKIN_MASK;
+	const unsigned osc_clk = pio_read_32(&device->prm.clocks->clksel) &
+	    CLOCK_CONTROL_PRM_CLKSEL_SYS_CLKIN_MASK;
 	const unsigned clk_reg = pio_read_32(&device->prm.global->clksrc_ctrl);
-	const unsigned base_freq = sys_clk_freq_kHz(osc_clk)
-	    / GLOBAL_REG_PRM_CLKSRC_CTRL_SYSCLKDIV_GET(clk_reg);
+	const unsigned base_freq = sys_clk_freq_kHz(osc_clk) /
+	    GLOBAL_REG_PRM_CLKSRC_CTRL_SYSCLKDIV_GET(clk_reg);
 	ddf_msg(LVL_NOTE, "Base frequency: %d.%dMhz",
 	    base_freq / 1000, base_freq % 1000);
@@ -150,17 +150,17 @@
 			const uint32_t reg = pio_read_32(&mpu->clksel1_pll);
 			const unsigned multiplier =
-			    (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_MASK)
-				>> MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_SHIFT;
+			    (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_MASK) >>
+			    MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_SHIFT;
 			const unsigned divisor =
-			    (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_MASK)
-				>> MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_SHIFT;
+			    (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_MASK) >>
+			    MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_SHIFT;
 			const unsigned divisor2 =
-			    (pio_read_32(&mpu->clksel2_pll)
-			        & MPU_CM_CLKSEL2_PLL_MPU_DPLL_CLKOUT_DIV_MASK);
+			    (pio_read_32(&mpu->clksel2_pll) &
+			    MPU_CM_CLKSEL2_PLL_MPU_DPLL_CLKOUT_DIV_MASK);
 			if (multiplier && divisor && divisor2) {
 				/** See AMDM37x TRM p. 300 for the formula */
 				const unsigned freq =
-				    ((base_freq * multiplier) / (divisor + 1))
-				    / divisor2;
+				    ((base_freq * multiplier) / (divisor + 1)) /
+				    divisor2;
 				ddf_msg(LVL_NOTE, "MPU running at %d.%d MHz",
 				    freq / 1000, freq % 1000);
@@ -174,5 +174,5 @@
 			const unsigned divisor =
 			    MPU_CM_CLKSEL1_PLL_MPU_CLK_SRC_VAL(
-			        pio_read_32(&mpu->clksel1_pll));
+			    pio_read_32(&mpu->clksel1_pll));
 			ddf_msg(LVL_NOTE, "MPU DPLL in bypass mode, running at"
 			    " CORE CLK / %d MHz", divisor);
@@ -226,6 +226,6 @@
 			    freq / 1000, freq % 1000);
 			const unsigned l3_div =
-			    pio_read_32(&device->cm.core->clksel)
-			    & CORE_CM_CLKSEL_CLKSEL_L3_MASK;
+			    pio_read_32(&device->cm.core->clksel) &
+			    CORE_CM_CLKSEL_CLKSEL_L3_MASK;
 			if (l3_div == CORE_CM_CLKSEL_CLKSEL_L3_DIVIDED1 ||
 			    l3_div == CORE_CM_CLKSEL_CLKSEL_L3_DIVIDED2) {
@@ -234,5 +234,5 @@
 				    (freq / l3_div) % 1000);
 			} else {
-				ddf_msg(LVL_WARN,"L3 interface clock divisor is"
+				ddf_msg(LVL_WARN, "L3 interface clock divisor is"
 				    " invalid: %d", l3_div);
 			}
@@ -244,5 +244,5 @@
 	} else {
 		ddf_msg(LVL_WARN, "CORE CLK in bypass mode, fruunig at SYS_CLK"
-		   " frreq of %d.%d MHz", base_freq / 1000, base_freq % 1000);
+		    " frreq of %d.%d MHz", base_freq / 1000, base_freq % 1000);
 	}
 
@@ -268,7 +268,7 @@
 	 */
 	// TODO setup DPLL5
-	if ((pio_read_32(&device->cm.clocks->clken2_pll)
-	        & CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_MASK)
-	    != CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_LOCK) {
+	if ((pio_read_32(&device->cm.clocks->clken2_pll) &
+	    CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_MASK) !=
+	    CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_LOCK) {
 		/* Compute divisors and multiplier
 		 * See AMDM37x TRM p. 300 for the formula */
@@ -278,5 +278,5 @@
 		const unsigned div = (base_freq / 1000) - 1;
 		const unsigned div2 = 1;
-		if ( ((base_freq % 1000) != 0) || (div > 127)) {
+		if (((base_freq % 1000) != 0) || (div > 127)) {
 			ddf_msg(LVL_ERROR, "Rounding error, or divisor to big "
 			    "freq: %d, div: %d", base_freq, div);
@@ -333,5 +333,5 @@
 #if 0
 		printf("DPLL5 (and everything else) should be on: %"
-		    PRIx32" %"PRIx32".\n",
+		    PRIx32 " %" PRIx32 ".\n",
 		    pio_read_32(&device->cm.clocks->idlest_ckgen),
 		    pio_read_32(&device->cm.clocks->idlest2_ckgen));
@@ -369,5 +369,6 @@
 	pio_set_32(&device->tll->sysconfig, TLL_SYSCONFIG_SOFTRESET_FLAG, 5);
 	ddf_msg(LVL_DEBUG2, "Waiting for USB TLL reset");
-	while (!(pio_read_32(&device->tll->sysstatus) & TLL_SYSSTATUS_RESET_DONE_FLAG));
+	while (!(pio_read_32(&device->tll->sysstatus) & TLL_SYSSTATUS_RESET_DONE_FLAG))
+		;
 	ddf_msg(LVL_DEBUG, "USB TLL Reset done.");
 
Index: uspace/drv/platform/malta/malta.c
===================================================================
--- uspace/drv/platform/malta/malta.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/platform/malta/malta.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -239,5 +239,5 @@
 	ret = pio_enable((void *) GT_BASE, GT_SIZE, (void **) &gt);
 	if (ret != EOK)
-                return ret;
+		return ret;
 	val = uint32_t_le2host(pio_read_32(
 	    &gt[GT_PCI_CMD / sizeof(ioport32_t)]));
Index: uspace/drv/time/cmos-rtc/cmos-rtc.c
===================================================================
--- uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -362,5 +362,5 @@
 
 		/* Now check if it is stable */
-	} while(t->tm_sec != rtc_register_read(rtc, RTC_SEC) ||
+	} while (t->tm_sec != rtc_register_read(rtc, RTC_SEC) ||
 	    t->tm_min != rtc_register_read(rtc, RTC_MIN) ||
 	    t->tm_mday != rtc_register_read(rtc, RTC_DAY) ||
Index: uspace/lib/bithenge/src/transform.c
===================================================================
--- uspace/lib/bithenge/src/transform.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/bithenge/src/transform.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -382,5 +382,5 @@
  * @param node The value to store in the parameter.
  * @return EOK on success or an error code from errno.h. */
-errno_t bithenge_scope_set_param( bithenge_scope_t *scope, int i,
+errno_t bithenge_scope_set_param(bithenge_scope_t *scope, int i,
     bithenge_node_t *node)
 {
@@ -919,5 +919,5 @@
 	}
 
-MAKE_UINT_TRANSFORM(uint8   , uint8_t,  uint8_t_identity, prefix_length_1);
+MAKE_UINT_TRANSFORM(uint8,    uint8_t,  uint8_t_identity, prefix_length_1);
 MAKE_UINT_TRANSFORM(uint16le, uint16_t, uint16_t_le2host, prefix_length_2);
 MAKE_UINT_TRANSFORM(uint16be, uint16_t, uint16_t_be2host, prefix_length_2);
@@ -1058,21 +1058,21 @@
 
 static bithenge_named_transform_t primitive_transforms[] = {
-	{"ascii", &bithenge_ascii_transform},
-	{"bit", &bithenge_bit_transform},
-	{"bits_be", &bithenge_bits_be_transform},
-	{"bits_le", &bithenge_bits_le_transform},
-	{"known_length", &bithenge_known_length_transform},
-	{"nonzero_boolean", &bithenge_nonzero_boolean_transform},
-	{"uint8", &bithenge_uint8_transform},
-	{"uint16be", &bithenge_uint16be_transform},
-	{"uint16le", &bithenge_uint16le_transform},
-	{"uint32be", &bithenge_uint32be_transform},
-	{"uint32le", &bithenge_uint32le_transform},
-	{"uint64be", &bithenge_uint64be_transform},
-	{"uint64le", &bithenge_uint64le_transform},
-	{"uint_be", &bithenge_uint_be_transform},
-	{"uint_le", &bithenge_uint_le_transform},
-	{"zero_terminated", &bithenge_zero_terminated_transform},
-	{NULL, NULL}
+	{ "ascii", &bithenge_ascii_transform },
+	{ "bit", &bithenge_bit_transform },
+	{ "bits_be", &bithenge_bits_be_transform },
+	{ "bits_le", &bithenge_bits_le_transform },
+	{ "known_length", &bithenge_known_length_transform },
+	{ "nonzero_boolean", &bithenge_nonzero_boolean_transform },
+	{ "uint8", &bithenge_uint8_transform },
+	{ "uint16be", &bithenge_uint16be_transform },
+	{ "uint16le", &bithenge_uint16le_transform },
+	{ "uint32be", &bithenge_uint32be_transform },
+	{ "uint32le", &bithenge_uint32le_transform },
+	{ "uint64be", &bithenge_uint64be_transform },
+	{ "uint64le", &bithenge_uint64le_transform },
+	{ "uint_be", &bithenge_uint_be_transform },
+	{ "uint_le", &bithenge_uint_le_transform },
+	{ "zero_terminated", &bithenge_zero_terminated_transform },
+	{ NULL, NULL }
 };
 
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 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -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 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -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 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -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 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -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 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -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
 
Index: uspace/lib/ieee80211/include/ieee80211.h
===================================================================
--- uspace/lib/ieee80211/include/ieee80211.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/ieee80211/include/ieee80211.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -178,6 +178,6 @@
 extern void ieee80211_set_specific(ieee80211_dev_t *, void *);
 extern ddf_dev_t *ieee80211_get_ddf_dev(ieee80211_dev_t *);
-extern ieee80211_operating_mode_t
-    ieee80211_query_current_op_mode(ieee80211_dev_t *);
+extern ieee80211_operating_mode_t ieee80211_query_current_op_mode(
+    ieee80211_dev_t *);
 extern uint16_t ieee80211_query_current_freq(ieee80211_dev_t *);
 extern void ieee80211_query_bssid(ieee80211_dev_t *, nic_address_t *);
Index: uspace/lib/ieee80211/include/ieee80211_private.h
===================================================================
--- uspace/lib/ieee80211/include/ieee80211_private.h	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/ieee80211/include/ieee80211_private.h	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -382,5 +382,5 @@
 
 static inline void
-    ieee80211_scan_result_list_init(ieee80211_scan_result_list_t *results)
+ieee80211_scan_result_list_init(ieee80211_scan_result_list_t *results)
 {
 	list_initialize(&results->list);
@@ -389,5 +389,5 @@
 
 static inline void
-    ieee80211_scan_result_list_remove(ieee80211_scan_result_list_t *results,
+ieee80211_scan_result_list_remove(ieee80211_scan_result_list_t *results,
     ieee80211_scan_result_link_t *result)
 {
@@ -397,5 +397,5 @@
 
 static inline void
-    ieee80211_scan_result_list_append(ieee80211_scan_result_list_t *results,
+ieee80211_scan_result_list_append(ieee80211_scan_result_list_t *results,
     ieee80211_scan_result_link_t *result)
 {
Index: uspace/lib/ieee80211/src/ieee80211.c
===================================================================
--- uspace/lib/ieee80211/src/ieee80211.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/ieee80211/src/ieee80211.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -217,5 +217,5 @@
  */
 static inline bool
-    ieee80211_is_eapol_key_frame(ieee80211_eapol_key_frame_t *key_frame)
+ieee80211_is_eapol_key_frame(ieee80211_eapol_key_frame_t *key_frame)
 {
 	return (key_frame->packet_type == IEEE80211_EAPOL_KEY);
@@ -281,5 +281,5 @@
  */
 ieee80211_operating_mode_t
-    ieee80211_query_current_op_mode(ieee80211_dev_t *ieee80211_dev)
+ieee80211_query_current_op_mode(ieee80211_dev_t *ieee80211_dev)
 {
 	fibril_mutex_lock(&ieee80211_dev->gen_mutex);
Index: uspace/lib/softrend/filter.c
===================================================================
--- uspace/lib/softrend/filter.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/lib/softrend/filter.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -106,7 +106,7 @@
 	float weights[4];
 	weights[0] = (1 - x_delta) * (1 - y_delta);
-	weights[1] = (    x_delta) * (1 - y_delta);
-	weights[2] = (1 - x_delta) * (    y_delta);
-	weights[3] = (    x_delta) * (    y_delta);
+	weights[1] = x_delta       * (1 - y_delta);
+	weights[2] = (1 - x_delta) * y_delta;
+	weights[3] = x_delta       * y_delta;
 
 	return blend_pixels(4, weights, pixels);
Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/exfat/exfat_directory.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -455,5 +455,5 @@
 		if (i == df.file.count - 2) {
 			chars = ds.stream.name_size -
-			    EXFAT_NAME_PART_LEN*(df.file.count - 2);
+			    EXFAT_NAME_PART_LEN * (df.file.count - 2);
 		}
 
Index: uspace/srv/fs/exfat/exfat_fat.c
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/exfat/exfat_fat.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -142,5 +142,5 @@
 			 */
 			return block_get(block, nodep->idx->service_id, DATA_FS(bs) +
-		        (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) +
+			    (nodep->lastc_cached_value - EXFAT_CLST_FIRST) * SPC(bs) +
 			    (bn % SPC(bs)), flags);
 		}
@@ -201,5 +201,5 @@
 	if (!fragmented) {
 		rc = block_get(block, service_id, DATA_FS(bs) +
-		    (fcl - EXFAT_CLST_FIRST)*SPC(bs) + bn, flags);
+		    (fcl - EXFAT_CLST_FIRST) * SPC(bs) + bn, flags);
 	} else {
 		max_clusters = bn / SPC(bs);
@@ -514,5 +514,5 @@
 	block_t *b;
 	errno_t rc;
-	blocks = ROUND_UP(nodep->size, BPS(bs))/BPS(bs);
+	blocks = ROUND_UP(nodep->size, BPS(bs)) / BPS(bs);
 	count = BPS(bs);
 
Index: uspace/srv/fs/exfat/exfat_idx.c
===================================================================
--- uspace/srv/fs/exfat/exfat_idx.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/exfat/exfat_idx.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -119,5 +119,5 @@
 static inline size_t pos_key_hash(void *key)
 {
-	pos_key_t *pos = (pos_key_t*)key;
+	pos_key_t *pos = (pos_key_t *)key;
 
 	size_t hash = 0;
@@ -141,10 +141,10 @@
 static bool pos_key_equal(void *key, const ht_link_t *item)
 {
-	pos_key_t *pos = (pos_key_t*)key;
+	pos_key_t *pos = (pos_key_t *)key;
 	exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link);
 
-	return pos->service_id == fidx->service_id
-		&& pos->pdi == fidx->pdi
-		&& pos->pfc == fidx->pfc;
+	return pos->service_id == fidx->service_id &&
+	    pos->pdi == fidx->pdi &&
+	    pos->pfc == fidx->pfc;
 }
 
@@ -170,5 +170,5 @@
 static size_t idx_key_hash(void *key_arg)
 {
-	idx_key_t *key = (idx_key_t*)key_arg;
+	idx_key_t *key = (idx_key_t *)key_arg;
 	return hash_combine(key->service_id, key->index);
 }
@@ -183,5 +183,5 @@
 {
 	exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link);
-	idx_key_t *key = (idx_key_t*)key_arg;
+	idx_key_t *key = (idx_key_t *)key_arg;
 
 	return key->index == fidx->index && key->service_id == fidx->service_id;
@@ -509,5 +509,5 @@
 static bool rm_pos_service_id(ht_link_t *item, void *arg)
 {
-	service_id_t service_id = *(service_id_t*)arg;
+	service_id_t service_id = *(service_id_t *)arg;
 	exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link);
 
@@ -521,5 +521,5 @@
 static bool rm_idx_service_id(ht_link_t *item, void *arg)
 {
-	service_id_t service_id = *(service_id_t*)arg;
+	service_id_t service_id = *(service_id_t *)arg;
 	exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link);
 
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -248,5 +248,5 @@
 		fn = FS_NODE(nodep);
 	} else {
-skip_cache:
+	skip_cache:
 		/* Try to allocate a new node structure. */
 		fibril_mutex_unlock(&ffn_mutex);
@@ -533,5 +533,5 @@
 			    (BPS(di.bs) / sizeof(exfat_dentry_t));
 			exfat_idx_t *idx = exfat_idx_get_by_pos(service_id,
-				parentp->firstc, di.bnum * DPS(di.bs) + o);
+			    parentp->firstc, di.bnum * DPS(di.bs) + o);
 			if (!idx) {
 				/*
@@ -706,5 +706,5 @@
 		if (nodep->fragmented)
 			rc = exfat_free_clusters(bs, nodep->idx->service_id,
-				nodep->firstc);
+			    nodep->firstc);
 		else
 			rc = exfat_bitmap_free_clusters(bs, nodep,
@@ -805,5 +805,5 @@
 
 	exfat_directory_t di;
-	rc = exfat_directory_open(parentp,&di);
+	rc = exfat_directory_open(parentp, &di);
 	if (rc != EOK)
 		goto error;
@@ -1062,5 +1062,5 @@
 	rc = exfat_node_get_new_by_pos(&rootp, service_id, EXFAT_ROOT_PAR,
 	    EXFAT_ROOT_POS);
-	if (rc!=EOK) {
+	if (rc != EOK) {
 		(void) block_cache_fini(service_id);
 		block_fini(service_id);
@@ -1183,5 +1183,5 @@
 			block_fini(service_id);
 			exfat_idx_fini_by_service_id(service_id);
-    		    return ENOTSUP;
+			return ENOTSUP;
 		}
 	}
@@ -1409,10 +1409,10 @@
 		(void) exfat_directory_close(&di);
 
-err:
+	err:
 		(void) exfat_node_put(fn);
 		async_answer_0(chandle, rc);
 		return rc;
 
-miss:
+	miss:
 		rc = exfat_directory_close(&di);
 		if (rc != EOK)
@@ -1423,5 +1423,5 @@
 		return rc != EOK ? rc : ENOENT;
 
-hit:
+	hit:
 		pos = di.pos;
 		rc = exfat_directory_close(&di);
Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/fat/fat_fat.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -249,5 +249,5 @@
 	for (o = nodep->size; o < pos && o < boundary;
 	    o = ALIGN_DOWN(o + BPS(bs), BPS(bs))) {
-	    	int flags = (o % BPS(bs) == 0) ?
+		int flags = (o % BPS(bs) == 0) ?
 		    BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE;
 		rc = fat_block_get(&b, bs, nodep, o / BPS(bs), flags);
@@ -324,5 +324,5 @@
 			* first byte of next sector
 			*/
-			byte2 = ((uint8_t*) b1->data)[0];
+			byte2 = ((uint8_t *) b1->data)[0];
 
 			rc = block_put(b1);
@@ -469,5 +469,5 @@
 		return rc;
 
-	byte1 = ((uint8_t*) b->data)[offset % BPS(bs)];
+	byte1 = ((uint8_t *) b->data)[offset % BPS(bs)];
 	bool border = false;
 	/* This cluster access spans a sector boundary. */
@@ -495,5 +495,5 @@
 		}
 	} else
-		byte2 = ((uint8_t*) b->data)[(offset % BPS(bs)) + 1];
+		byte2 = ((uint8_t *) b->data)[(offset % BPS(bs)) + 1];
 
 	if (IS_ODD(clst)) {
Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/fat/fat_idx.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -119,5 +119,5 @@
 static inline size_t pos_key_hash(void *key)
 {
-	pos_key_t *pos = (pos_key_t*)key;
+	pos_key_t *pos = (pos_key_t *)key;
 
 	size_t hash = 0;
@@ -141,10 +141,10 @@
 static bool pos_key_equal(void *key, const ht_link_t *item)
 {
-	pos_key_t *pos = (pos_key_t*)key;
+	pos_key_t *pos = (pos_key_t *)key;
 	fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
-	return pos->service_id == fidx->service_id
-		&& pos->pdi == fidx->pdi
-		&& pos->pfc == fidx->pfc;
+	return pos->service_id == fidx->service_id &&
+	    pos->pdi == fidx->pdi &&
+	    pos->pfc == fidx->pfc;
 }
 
@@ -170,5 +170,5 @@
 static size_t idx_key_hash(void *key_arg)
 {
-	idx_key_t *key = (idx_key_t*)key_arg;
+	idx_key_t *key = (idx_key_t *)key_arg;
 	return hash_combine(key->service_id, key->index);
 }
@@ -183,5 +183,5 @@
 {
 	fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
-	idx_key_t *key = (idx_key_t*)key_arg;
+	idx_key_t *key = (idx_key_t *)key_arg;
 
 	return key->index == fidx->index && key->service_id == fidx->service_id;
@@ -508,5 +508,5 @@
 static bool rm_pos_service_id(ht_link_t *item, void *arg)
 {
-	service_id_t service_id = *(service_id_t*)arg;
+	service_id_t service_id = *(service_id_t *)arg;
 	fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
@@ -520,5 +520,5 @@
 static bool rm_idx_service_id(ht_link_t *item, void *arg)
 {
-	service_id_t service_id = *(service_id_t*)arg;
+	service_id_t service_id = *(service_id_t *)arg;
 	fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
 
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -241,5 +241,5 @@
 		fn = FS_NODE(nodep);
 	} else {
-skip_cache:
+	skip_cache:
 		/* Try to allocate a new node structure. */
 		fibril_mutex_unlock(&ffn_mutex);
@@ -1289,10 +1289,10 @@
 			goto miss;
 
-err:
+	err:
 		(void) fat_node_put(fn);
 		async_answer_0(chandle, rc);
 		return rc;
 
-miss:
+	miss:
 		rc = fat_directory_close(&di);
 		if (rc != EOK)
@@ -1303,5 +1303,5 @@
 		return rc != EOK ? rc : ENOENT;
 
-hit:
+	hit:
 		pos = di.pos;
 		rc = fat_directory_close(&di);
Index: uspace/srv/fs/locfs/locfs_ops.c
===================================================================
--- uspace/srv/fs/locfs/locfs_ops.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/locfs/locfs_ops.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -73,5 +73,5 @@
 static size_t services_key_hash(void *key)
 {
-	return *(service_id_t*)key;
+	return *(service_id_t *)key;
 }
 
@@ -85,5 +85,5 @@
 {
 	service_t *dev = hash_table_get_inst(item, service_t, link);
-	return (dev->service_id == *(service_id_t*)key);
+	return (dev->service_id == *(service_id_t *)key);
 }
 
@@ -234,5 +234,5 @@
 		fibril_mutex_lock(&services_mutex);
 		ht_link_t *lnk;
-restart:
+	restart:
 		lnk = hash_table_find(&services, &node->service_id);
 		if (lnk == NULL) {
Index: uspace/srv/fs/mfs/mfs_dentry.c
===================================================================
--- uspace/srv/fs/mfs/mfs_dentry.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/mfs/mfs_dentry.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -171,5 +171,5 @@
 	/* Search the directory entry to be removed */
 	unsigned i;
-	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
+	for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
 		r = mfs_read_dentry(mnode, &d_info, i);
 		if (r != EOK)
Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -103,5 +103,5 @@
 open_nodes_key_hash(void *key)
 {
-	node_key_t *node_key = (node_key_t*)key;
+	node_key_t *node_key = (node_key_t *)key;
 	return hash_combine(node_key->service_id, node_key->index);
 }
@@ -117,9 +117,9 @@
 open_nodes_key_equal(void *key, const ht_link_t *item)
 {
-	node_key_t *node_key = (node_key_t*)key;
+	node_key_t *node_key = (node_key_t *)key;
 	struct mfs_node *mnode = hash_table_get_inst(item, struct mfs_node, link);
 
-	return node_key->service_id == mnode->instance->service_id
-		&& node_key->index == mnode->ino_i->index;
+	return node_key->service_id == mnode->instance->service_id &&
+	    node_key->index == mnode->ino_i->index;
 }
 
@@ -361,5 +361,5 @@
 	if (sbi)
 		free(sbi);
-	if(instance)
+	if (instance)
 		free(instance);
 	return rc;
@@ -871,5 +871,5 @@
 		async_answer_0(chandle, rc != EOK ? rc : ENOENT);
 		return rc;
-found:
+	found:
 		async_data_read_finalize(chandle, d_info.d_name,
 		    str_size(d_info.d_name) + 1);
@@ -1102,5 +1102,5 @@
 static bool
 check_magic_number(uint16_t magic, bool *native,
-		mfs_version_t *version, bool *longfilenames)
+    mfs_version_t *version, bool *longfilenames)
 {
 	bool rc = true;
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -238,5 +238,5 @@
 static bool rm_service_id_nodes(ht_link_t *item, void *arg)
 {
-	service_id_t sid = *(service_id_t*)arg;
+	service_id_t sid = *(service_id_t *)arg;
 	tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link);
 
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/hid/compositor/compositor.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -488,5 +488,5 @@
 						if (y_bnd_ghost == y_dmg_ghost) {
 							for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-								    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+							    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
 								ghost_color = surface_get_pixel(vp->surface,
 								    x, y_dmg_ghost - vp->pos.y);
@@ -498,5 +498,5 @@
 						if (y_bnd_ghost + h_bnd_ghost == y_dmg_ghost + h_dmg_ghost) {
 							for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-								    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+							    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
 								ghost_color = surface_get_pixel(vp->surface,
 								    x, y_dmg_ghost - vp->pos.y + h_dmg_ghost - 1);
@@ -508,5 +508,5 @@
 						if (x_bnd_ghost == x_dmg_ghost) {
 							for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-								    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+							    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
 								ghost_color = surface_get_pixel(vp->surface,
 								    x_dmg_ghost - vp->pos.x, y);
@@ -518,5 +518,5 @@
 						if (x_bnd_ghost + w_bnd_ghost == x_dmg_ghost + w_dmg_ghost) {
 							for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-								    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+							    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
 								ghost_color = surface_get_pixel(vp->surface,
 								    x_dmg_ghost - vp->pos.x + w_dmg_ghost - 1, y);
@@ -562,5 +562,6 @@
 						while (count-- != 0) {
 							*dst = (*src & 0xff000000) ? *src : *dst;
-							++dst; ++src;
+							++dst;
+							++src;
 						}
 					}
@@ -1347,5 +1348,6 @@
 			if (fy > 0) {
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-				if (scale) win->fy *= fy;
+				if (scale)
+					win->fy *= fy;
 #endif
 #if ANIMATE_WINDOW_TRANSFORMS == 1
@@ -1449,8 +1451,23 @@
 
 	if (w_i == 0 || h_i == 0) {
-		rect1->x = x_u; rect2->x = 0; rect3->x = 0; rect4->x = 0;
-		rect1->y = y_u; rect2->y = 0; rect3->y = 0; rect4->y = 0;
-		rect1->w = w_u; rect2->w = 0; rect3->w = 0; rect4->w = 0;
-		rect1->h = h_u; rect2->h = 0; rect3->h = 0; rect4->h = 0;
+		rect1->x = x_u;
+		rect2->x = 0;
+		rect3->x = 0;
+		rect4->x = 0;
+
+		rect1->y = y_u;
+		rect2->y = 0;
+		rect3->y = 0;
+		rect4->y = 0;
+
+		rect1->w = w_u;
+		rect2->w = 0;
+		rect3->w = 0;
+		rect4->w = 0;
+
+		rect1->h = h_u;
+		rect2->h = 0;
+		rect3->h = 0;
+		rect4->h = 0;
 	} else {
 		rect1->x = x_u;
@@ -1477,5 +1494,5 @@
 #endif
 
-static errno_t comp_abs_move(input_t *input, unsigned x , unsigned y,
+static errno_t comp_abs_move(input_t *input, unsigned x, unsigned y,
     unsigned max_x, unsigned max_y)
 {
@@ -1526,5 +1543,5 @@
 	sysarg_t cursor_height;
 	surface_get_resolution(pointer->cursor.states[pointer->state],
-	     &cursor_width, &cursor_height);
+	    &cursor_width, &cursor_height);
 
 	if (pointer->pos.x + dx < viewport_bound_rect.x)
@@ -1788,8 +1805,8 @@
 
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-		comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
-		comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
-		comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
-		comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
+	comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
+	comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
+	comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
+	comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
 #endif
 
@@ -1826,17 +1843,15 @@
     keymod_t mods, wchar_t c)
 {
-	bool win_transform = (mods & KM_ALT) && (
-	    key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
+	bool win_transform = (mods & KM_ALT) &&
+	    (key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
 	    key == KC_Q || key == KC_E || key == KC_R || key == KC_F);
-	bool win_resize = (mods & KM_ALT) && (
-	    key == KC_T || key == KC_G || key == KC_B || key == KC_N);
-	bool win_opacity = (mods & KM_ALT) && (
-	    key == KC_C || key == KC_V);
+	bool win_resize = (mods & KM_ALT) &&
+	    (key == KC_T || key == KC_G || key == KC_B || key == KC_N);
+	bool win_opacity = (mods & KM_ALT) && (key == KC_C || key == KC_V);
 	bool win_close = (mods & KM_ALT) && (key == KC_X);
 	bool win_switch = (mods & KM_ALT) && (key == KC_TAB);
-	bool viewport_move = (mods & KM_ALT) && (
-	    key == KC_I || key == KC_K || key == KC_J || key == KC_L);
-	bool viewport_change = (mods & KM_ALT) && (
-	    key == KC_O || key == KC_P);
+	bool viewport_move = (mods & KM_ALT) &&
+	    (key == KC_I || key == KC_K || key == KC_J || key == KC_L);
+	bool viewport_change = (mods & KM_ALT) && (key == KC_O || key == KC_P);
 	bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK);
 	bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
@@ -2120,6 +2135,5 @@
 		if (filter_index == 0) {
 			filter = filter_nearest;
-		}
-		else {
+		} else {
 			filter = filter_bilinear;
 		}
Index: uspace/srv/hid/rfb/rfb.c
===================================================================
--- uspace/srv/hid/rfb/rfb.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/hid/rfb/rfb.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -83,6 +83,6 @@
 
 /** Receive count characters (with buffering) */
-__attribute__((warn_unused_result))
-static errno_t recv_chars(tcp_conn_t *conn, char *c, size_t count)
+static errno_t __attribute__((warn_unused_result))
+recv_chars(tcp_conn_t *conn, char *c, size_t count)
 {
 	for (size_t i = 0; i < count; i++) {
@@ -217,9 +217,9 @@
 }
 
-__attribute__((warn_unused_result))
-static errno_t recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
+static errno_t __attribute__((warn_unused_result))
+recv_message(tcp_conn_t *conn, char type, void *buf, size_t size)
 {
 	memcpy(buf, &type, 1);
-	return recv_chars(conn, ((char *) buf) + 1, size -1);
+	return recv_chars(conn, ((char *) buf) + 1, size - 1);
 }
 
@@ -236,6 +236,5 @@
 		if (free && first_free_index == -1) {
 			first_free_index = i;
-		}
-		else if (!free && RED(rfb->palette[i]) == RED(pixel) &&
+		} else if (!free && RED(rfb->palette[i]) == RED(pixel) &&
 		    GREEN(rfb->palette[i]) == GREEN(pixel) &&
 		    BLUE(rfb->palette[i]) == BLUE(pixel)) {
@@ -268,20 +267,16 @@
 		uint8_t pix8 = pix;
 		memcpy(buf, &pix8, 1);
-	}
-	else if (pf->bpp == 16) {
+	} else if (pf->bpp == 16) {
 		uint16_t pix16 = pix;
 		if (pf->big_endian) {
 			pix16 = host2uint16_t_be(pix16);
-		}
-		else {
+		} else {
 			pix16 = host2uint16_t_le(pix16);
 		}
 		memcpy(buf, &pix16, 2);
-	}
-	else if (pf->bpp == 32) {
+	} else if (pf->bpp == 32) {
 		if (pf->big_endian) {
 			pix = host2uint32_t_be(pix);
-		}
-		else {
+		} else {
 			pix = host2uint32_t_le(pix);
 		}
@@ -294,6 +289,5 @@
 	if (rfb->pixel_format.true_color) {
 		rfb_encode_true_color(&rfb->pixel_format, buf, pixel);
-	}
-	else {
+	} else {
 		rfb_encode_index(rfb, buf, pixel);
 	}
@@ -366,5 +360,7 @@
 
 typedef enum {
-	COMP_NONE, COMP_SKIP_START, COMP_SKIP_END
+	COMP_NONE,
+	COMP_SKIP_START,
+	COMP_SKIP_END
 } cpixel_compress_type_t;
 
@@ -387,6 +383,5 @@
 		if (pixel_format->big_endian) {
 			mask = host2uint32_t_be(mask);
-		}
-		else {
+		} else {
 			mask = host2uint32_t_le(mask);
 		}
@@ -396,6 +391,5 @@
 			ctx->compress_type = COMP_SKIP_START;
 			ctx->size = 3;
-		}
-		else if (mask_data[3] == 0) {
+		} else if (mask_data[3] == 0) {
 			ctx->compress_type = COMP_SKIP_END;
 			ctx->size = 3;
@@ -509,6 +503,5 @@
 	size_t buf_size = sizeof(rfb_framebuffer_update_t) +
 	    sizeof(rfb_rectangle_t) * 1 +
-	    rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL)
-	    ;
+	    rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL);
 
 	void *buf = malloc(buf_size);
@@ -534,6 +527,5 @@
 		rect->enctype = RFB_ENCODING_TRLE;
 		pos += rfb_rect_encode_trle(rfb, rect, pos);
-	}
-	else {
+	} else {
 		rect->enctype = RFB_ENCODING_RAW;
 		pos += rfb_rect_encode_raw(rfb, rect, pos);
@@ -583,6 +575,5 @@
 		    pixel_format->g_max, pixel_format->g_shift, pixel_format->b_max,
 		    pixel_format->b_shift);
-	}
-	else {
+	} else {
 		if (rfb->palette == NULL) {
 			rfb->palette = malloc(sizeof(pixel_t) * 256);
@@ -675,5 +666,5 @@
 	server_init->width = rfb->width;
 	server_init->height = rfb->height;
-	server_init->pixel_format = rfb->pixel_format,
+	server_init->pixel_format = rfb->pixel_format;
 	server_init->name_length = name_length;
 	rfb_server_init_to_be(server_init, server_init);
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision 8ebe212533840cb545a4f768a0689f6940125144)
+++ uspace/srv/net/udp/service.c	(revision 18b6a8849d630cc3bca153fb21bd225eebb16f4c)
@@ -359,6 +359,6 @@
  * @param icall         Async request data
  */
-static
-void udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
+static void
+udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {