Index: uspace/app/mkfat/fat.h
===================================================================
--- uspace/app/mkfat/fat.h	(revision 81e9cb39036c08c482d5b09ff34bf1222477280c)
+++ uspace/app/mkfat/fat.h	(revision 26ad20b635d67b5ae16154fc91c188f9ab289cbb)
@@ -47,5 +47,5 @@
 #define FAT32	32
 
-#define FAT_SIZE(a) ((a==FAT12)? 1.5 : ( (a==FAT16)? 2 : 4  ) ) 
+#define FAT_SIZE(a) (((a) == FAT12) ? 1.5 : (((a) == FAT16) ? 2 : 4)) 
 
 typedef struct fat_bs {
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision 81e9cb39036c08c482d5b09ff34bf1222477280c)
+++ uspace/app/mkfat/mkfat.c	(revision 26ad20b635d67b5ae16154fc91c188f9ab289cbb)
@@ -215,5 +215,5 @@
 static void syntax_print(void)
 {
-	printf("syntax: mkfat32 [--size <sectors>] [--type 12|16|32] <device_name>\n");
+	printf("syntax: mkfat [--size <sectors>] [--type 12|16|32] <device_name>\n");
 }
 
@@ -229,9 +229,9 @@
 
 	/*
-     * Make a conservative guess on the FAT size needed for the file
-     * system. The optimum could be potentially smaller since we
-     * do not subtract size of the FAT itself when computing the
-     * size of the data region.
-     */
+	 * Make a conservative guess on the FAT size needed for the file
+	 * system. The optimum could be potentially smaller since we
+	 * do not subtract size of the FAT itself when computing the
+	 * size of the data region.
+	 */
 
 	if (cfg->fat_type == FAT12)
@@ -242,6 +242,5 @@
 		cfg->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
 			cfg->sector_size);
-	}
-	else
+	} else
 		cfg->rootdir_sectors = 0;
 	non_data_sectors_lb = cfg->reserved_sectors + cfg->rootdir_sectors;
@@ -251,6 +250,6 @@
 
 	if ((cfg->fat_type == FAT12 && cfg->total_clusters > FAT12_CLST_MAX) ||
-		(cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
-		cfg->total_clusters > FAT16_CLST_MAX)) ||
+	    (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
+	    cfg->total_clusters > FAT16_CLST_MAX)) ||
 	    (cfg->fat_type == FAT32 && cfg->total_clusters <= FAT16_CLST_MAX))
 		return ENOSPC;
@@ -340,5 +339,5 @@
 		}
 	} else {
-		for (i=0; i<cfg->sectors_per_cluster; i++) {
+		for (i = 0; i < cfg->sectors_per_cluster; i++) {
 			rc = block_write_direct(service_id, addr, 1, buffer);
 			if (rc != EOK)