Index: uspace/app/trace/ipcp.c
===================================================================
--- uspace/app/trace/ipcp.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/app/trace/ipcp.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -107,5 +107,5 @@
 	// now handled using capabilities
 	if (CAP_HANDLE_RAW(phone) < 0 || CAP_HANDLE_RAW(phone) >= MAX_PHONE)
-	    return;
+		return;
 	connections[CAP_HANDLE_RAW(phone)].server = server;
 	connections[CAP_HANDLE_RAW(phone)].proto = proto;
@@ -218,5 +218,6 @@
 			putchar('(');
 			for (i = 1; i <= oper->argc; ++i) {
-				if (i > 1) printf(", ");
+				if (i > 1)
+					printf(", ");
 				val_print(args[i], oper->arg_type[i - 1]);
 			}
@@ -315,5 +316,5 @@
 		if ((display_mask & DM_SYSTEM) != 0) {
 			printf("Registering connection (phone %p, protocol: %s)\n", cphone,
-		    proto->name);
+			    proto->name);
 		}
 
Index: uspace/app/trace/proto.c
===================================================================
--- uspace/app/trace/proto.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/app/trace/proto.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -136,5 +136,6 @@
 {
 	ht_link_t *item = hash_table_find(&srv_proto, &srv);
-	if (item == NULL) return NULL;
+	if (item == NULL)
+		return NULL;
 
 	srv_proto_t *sp = hash_table_get_inst(item, srv_proto_t, link);
@@ -179,5 +180,6 @@
 {
 	ht_link_t *item = hash_table_find(&proto->method_oper, &method);
-	if (item == NULL) return NULL;
+	if (item == NULL)
+		return NULL;
 
 	method_oper_t *mo = hash_table_get_inst(item, method_oper_t, link);
Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
+++ uspace/app/trace/trace.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -185,5 +185,5 @@
 
 	rc = udebug_thread_read(sess, thread_hash_buf,
-		THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed);
+	    THBUF_SIZE * sizeof(unsigned), &tb_copied, &tb_needed);
 	if (rc != EOK) {
 		printf("udebug_thread_read() -> %s\n", str_error_name(rc));
@@ -246,11 +246,25 @@
 		} else {
 			switch (sval) {
-			case '\a': printf("'\\a'"); break;
-			case '\b': printf("'\\b'"); break;
-			case '\n': printf("'\\n'"); break;
-			case '\r': printf("'\\r'"); break;
-			case '\t': printf("'\\t'"); break;
-			case '\\': printf("'\\\\'"); break;
-			default: printf("'\\x%02" PRIxn "'", val); break;
+			case '\a':
+				printf("'\\a'");
+				break;
+			case '\b':
+				printf("'\\b'");
+				break;
+			case '\n':
+				printf("'\\n'");
+				break;
+			case '\r':
+				printf("'\\r'");
+				break;
+			case '\t':
+				printf("'\\t'");
+				break;
+			case '\\':
+				printf("'\\\\'");
+				break;
+			default:
+				printf("'\\x%02" PRIxn "'", val);
+				break;
 			}
 		}
@@ -272,5 +286,6 @@
 
 	putchar('(');
-	if (n > 0) printf("%" PRIun, sc_args[0]);
+	if (n > 0)
+		printf("%" PRIun, sc_args[0]);
 	for (i = 1; i < n; i++) {
 		printf(", %" PRIun, sc_args[i]);
@@ -320,5 +335,6 @@
 	errno_t rc;
 
-	if (sc_rc == 0) return;
+	if (sc_rc == 0)
+		return;
 
 	memset(&call, 0, sizeof(call));
@@ -348,6 +364,5 @@
 			printf("%s", syscall_desc[sc_id].name);
 			print_sc_args(sc_args, syscall_desc[sc_id].n_args);
-		}
-		else {
+		} else {
 			printf("unknown_syscall<%d>", sc_id);
 			print_sc_args(sc_args, 6);