Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -97,5 +97,6 @@
 	block_size = DEFAULT_BLOCK_SIZE;
 
-	++argv; --argc;
+	++argv;
+	--argc;
 	while (*argv != NULL && (*argv)[0] == '-') {
 		/* Option */
@@ -113,5 +114,6 @@
 				return -1;
 			}
-			++argv; --argc;
+			++argv;
+			--argc;
 		} else {
 			printf("Invalid option '%s'.\n", *argv);
@@ -119,5 +121,6 @@
 			return -1;
 		}
-		++argv; --argc;
+		++argv;
+		--argc;
 	}
 
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -97,5 +97,5 @@
 	/* If device is SATA, add device to the disk array. */
 	disk[disk_count].sess = ahci_get_sess(funh, &disk[disk_count].dev_name);
-	if(disk[disk_count].sess != NULL) {
+	if (disk[disk_count].sess != NULL) {
 
 		ahci_get_sata_device_name(disk[disk_count].sess,
@@ -113,6 +113,6 @@
 		printf("Device %s - %s , blocks: %lu, block_size: %lu\n",
 		    disk[disk_count].dev_name, disk[disk_count].sata_dev_name,
-			    (long unsigned int) disk[disk_count].blocks,
-				(long unsigned int) disk[disk_count].block_size);
+		    (long unsigned int) disk[disk_count].blocks,
+		    (long unsigned int) disk[disk_count].block_size);
 
 		++disk_count;
@@ -268,5 +268,5 @@
 	}
 
-	for(int i = 0; i < disk_count; i++) {
+	for (int i = 0; i < disk_count; i++) {
 		char name[1024];
 		snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);
Index: uspace/srv/bd/vbd/disk.c
===================================================================
--- uspace/srv/bd/vbd/disk.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/bd/vbd/disk.c	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -181,5 +181,5 @@
 
 	list_foreach(vbds_disks, ldisks, vbds_disk_t, disk)
-		disk->present = false;
+	    disk->present = false;
 
 	for (i = 0; i < count; i++) {