Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 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 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 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 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 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 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 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);