Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision 5754c31e4e22b3ba9c461583e759f5fed5d44704)
@@ -98,6 +98,5 @@
 				event.button = 1;
 				state->emit_event_fn(&event);
-			}
-			else if (finger1 && !state->finger1_pressed) {
+			} else if (finger1 && !state->finger1_pressed) {
 				state->finger1_pressed = true;
 
@@ -105,6 +104,5 @@
 				event.button = 1;
 				state->emit_event_fn(&event);
-			}
-			else {
+			} else {
 				event.type = MOVE;
 				event.button = 1;
@@ -112,6 +110,5 @@
 			}
 		}
-	}
-	else {
+	} else {
 		if (size != 9)
 			return true;
@@ -133,6 +130,5 @@
 			event.type = PROXIMITY_IN;
 			state->emit_event_fn(&event);
-		}
-		else if (!proximity && state->stylus_in_proximity) {
+		} else if (!proximity && state->stylus_in_proximity) {
 			/* Stylus came out of proximity */
 			state->stylus_in_proximity = false;
@@ -140,6 +136,5 @@
 			event.type = PROXIMITY_OUT;
 			state->emit_event_fn(&event);
-		}
-		else {
+		} else {
 			/* Proximity state didn't change, but we need to check if it is still eraser */
 			if (state->stylus_is_eraser && !button2) {
@@ -151,6 +146,5 @@
 				state->emit_event_fn(&event);
 				state->stylus_is_eraser = false;
-			}
-			else if (!state->stylus_is_eraser && !tip && button2) {
+			} else if (!state->stylus_is_eraser && !tip && button2) {
 				event.type = PROXIMITY_OUT;
 				event.source = STYLUS_TIP;
@@ -170,6 +164,5 @@
 				event.button = 1;
 				state->emit_event_fn(&event);
-			}
-			else if (!tip && state->tip_pressed) {
+			} else if (!tip && state->tip_pressed) {
 				state->tip_pressed = false;
 				event.type = RELEASE;
@@ -184,6 +177,5 @@
 				event.button = 2;
 				state->emit_event_fn(&event);
-			}
-			else if (!button1 && state->button1_pressed) {
+			} else if (!button1 && state->button1_pressed) {
 				state->button1_pressed = false;
 				event.type = RELEASE;
@@ -198,6 +190,5 @@
 				event.button = 3;
 				state->emit_event_fn(&event);
-			}
-			else if (!button2 && state->button2_pressed) {
+			} else if (!button2 && state->button2_pressed) {
 				state->button2_pressed = false;
 				event.type = RELEASE;
@@ -210,6 +201,5 @@
 			event.button = 0;
 			state->emit_event_fn(&event);
-		}
-		else {
+		} else {
 			if (tip && !state->tip_pressed) {
 				state->tip_pressed = true;
@@ -218,6 +208,5 @@
 				event.button = 1;
 				state->emit_event_fn(&event);
-			}
-			else if (!tip && state->tip_pressed) {
+			} else if (!tip && state->tip_pressed) {
 				state->tip_pressed = false;
 				event.type = RELEASE;
@@ -310,5 +299,6 @@
 
 		/* Skip data until a start of packet is found */
-		while (i < state->buf_end && (state->buf[i] & START_OF_PACKET) == 0) i++;
+		while (i < state->buf_end && (state->buf[i] & START_OF_PACKET) == 0)
+			i++;
 
 		size_t start = i;
@@ -322,9 +312,7 @@
 			if (state->buf[i] & CONTROL_PACKET) {
 				packet_remaining = 11;
-			}
-			else if (state->buf[i] & TOUCH_EVENT) {
+			} else if (state->buf[i] & TOUCH_EVENT) {
 				packet_remaining = 5;
-			}
-			else {
+			} else {
 				packet_remaining = 9;
 			}
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision 5754c31e4e22b3ba9c461583e759f5fed5d44704)
@@ -94,5 +94,6 @@
 	fibril_mutex_unlock(&client_mutex);
 
-	if (!sess) return;
+	if (!sess)
+		return;
 
 	async_exch_t *exch = async_exchange_begin(sess);
@@ -105,8 +106,8 @@
 		}
 		async_msg_4(exch, MOUSEEV_ABS_MOVE_EVENT, event->x, event->y,
-				    max_x, max_y);
+		    max_x, max_y);
 		if (event->type == PRESS || event->type == RELEASE) {
 			async_msg_2(exch, MOUSEEV_BUTTON_EVENT, event->button,
-				    event->type == PRESS);
+			    event->type == PRESS);
 		}
 	}
@@ -118,35 +119,35 @@
 	const char *type = NULL;
 	switch (event->type) {
-		case PRESS:
-			type = "PRESS";
-			break;
-		case RELEASE:
-			type = "RELEASE";
-			break;
-		case PROXIMITY_IN:
-			type = "PROXIMITY IN";
-			break;
-		case PROXIMITY_OUT:
-			type = "PROXIMITY OUT";
-			break;
-		case MOVE:
-			type = "MOVE";
-			break;
-		default:
-			type = "UNKNOWN";
-			break;
+	case PRESS:
+		type = "PRESS";
+		break;
+	case RELEASE:
+		type = "RELEASE";
+		break;
+	case PROXIMITY_IN:
+		type = "PROXIMITY IN";
+		break;
+	case PROXIMITY_OUT:
+		type = "PROXIMITY OUT";
+		break;
+	case MOVE:
+		type = "MOVE";
+		break;
+	default:
+		type = "UNKNOWN";
+		break;
 	}
 
 	const char *source = NULL;
 	switch (event->source) {
-		case STYLUS_TIP:
-			source = "stylus tip";
-			break;
-		case STYLUS_ERASER:
-			source = "stylus eraser";
-			break;
-		case TOUCH:
-			source = "touch";
-			break;
+	case STYLUS_TIP:
+		source = "stylus tip";
+		break;
+	case STYLUS_ERASER:
+		source = "stylus eraser";
+		break;
+	case TOUCH:
+		source = "touch";
+		break;
 	}
 
@@ -160,15 +161,15 @@
 {
 	switch (data_id) {
-		case 0:
-			return "resistive+stylus";
-		case 1:
-			return "capacitive+stylus";
-		case 2:
-			return "resistive";
-		case 3:
-		case 4:
-			return "capacitive";
-		case 5:
-			return "penabled";
+	case 0:
+		return "resistive+stylus";
+	case 1:
+		return "capacitive+stylus";
+	case 2:
+		return "resistive";
+	case 3:
+	case 4:
+		return "capacitive";
+	case 5:
+		return "penabled";
 	}
 	return "unknown";
@@ -189,5 +190,5 @@
 	if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
 		size_t arg_offset = str_lsize(argv[arg], 7);
-		char* arg_str = argv[arg] + arg_offset;
+		char *arg_str = argv[arg] + arg_offset;
 		if (str_length(arg_str) == 0) {
 			fprintf(stderr, "--baud requires an argument\n");
@@ -219,6 +220,5 @@
 		}
 		arg++;
-	}
-	else {
+	} else {
 		category_id_t serial_cat_id;
 
@@ -233,5 +233,6 @@
 		size_t svc_count;
 
-		rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);		if (rc != EOK) {
+		rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);
+		if (rc != EOK) {
 			fprintf(stderr, "Failed getting list of services\n");
 			return 1;
@@ -301,10 +302,9 @@
 	if (state.stylus_tilt_supported) {
 		printf("%ux%u\n", state.stylus_max_xtilt, state.stylus_max_ytilt);
-	}
-	else {
+	} else {
 		printf("not supported\n");
 	}
 	printf(" Touch: %ux%u type: %s\n", state.touch_max_x, state.touch_max_y,
-		touch_type(state.touch_type));
+	    touch_type(state.touch_type));
 
 	fid_t fibril = fibril_create(read_fibril, NULL);
@@ -337,6 +337,5 @@
 	if (rc != EOK) {
 		printf(NAME ": Unable to get mouse category id.\n");
-	}
-	else {
+	} else {
 		rc = loc_service_add_to_cat(service_id, mouse_category);
 		if (rc != EOK) {