Index: uspace/srv/fs/exfat/exfat_directory.c
===================================================================
--- uspace/srv/fs/exfat/exfat_directory.c	(revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b)
+++ uspace/srv/fs/exfat/exfat_directory.c	(revision 0dbe5ac3da1c850ebb3e4d5701b7b4409a026277)
@@ -147,10 +147,9 @@
 	if (di->pos > 0) {
 		di->pos -= 1;
-		rc=exfat_directory_block_load(di);
-	}
-	else
+		rc = exfat_directory_block_load(di);
+	} else
 		return ENOENT;
 	
-	if (rc!=EOK)
+	if (rc != EOK)
 		di->pos += 1;
 	
@@ -281,5 +280,5 @@
 		return rc;
 	count = de->file.count + 1;
-	array = (exfat_dentry_t *) malloc(count*sizeof(exfat_dentry_t));
+	array = (exfat_dentry_t *) malloc(count * sizeof(exfat_dentry_t));
 	if (!array)
 		return ENOMEM;
@@ -290,5 +289,5 @@
 		array[i] = *de;
 		rc = exfat_directory_next(di);
-		if (rc!=EOK) {
+		if (rc != EOK) {
 			free(array);
 			return rc;
@@ -378,5 +377,5 @@
 
 	/* Looking for set of free entries */
-	rc = exfat_directory_lookup_free(di, df.file.count+1);
+	rc = exfat_directory_lookup_free(di, df.file.count + 1);
 	if (rc != EOK)
 		return rc;
Index: uspace/srv/fs/exfat/exfat_fat.c
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.c	(revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b)
+++ uspace/srv/fs/exfat/exfat_fat.c	(revision 0dbe5ac3da1c850ebb3e4d5701b7b4409a026277)
@@ -135,9 +135,9 @@
 	if (nodep->fragmented) {
 		if (((((nodep->size - 1) / BPS(bs)) / SPC(bs)) == bn / SPC(bs)) &&
-			nodep->lastc_cached_valid) {
-				/*
-			* This is a request to read a block within the last cluster
-			* when fortunately we have the last cluster number cached.
-			*/
+		    nodep->lastc_cached_valid) {
+			/*
+			 * This is a request to read a block within the last cluster
+			 * when fortunately we have the last cluster number cached.
+			 */
 			return block_get(block, nodep->idx->service_id, DATA_FS(bs) + 
 		        (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) + 
@@ -195,10 +195,10 @@
 	int rc;
 
-	if (fcl < EXFAT_CLST_FIRST || fcl > DATA_CNT(bs)+2)
+	if (fcl < EXFAT_CLST_FIRST || fcl > DATA_CNT(bs) + 2)
 		return ELIMIT;
 
 	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);
@@ -209,5 +209,5 @@
 
 		rc = block_get(block, service_id, DATA_FS(bs) + 
-		    (c-EXFAT_CLST_FIRST)*SPC(bs) + (bn % SPC(bs)), flags);
+		    (c - EXFAT_CLST_FIRST) * SPC(bs) + (bn % SPC(bs)), flags);
 
 		if (clp)
@@ -310,14 +310,15 @@
 
 	fibril_mutex_lock(&exfat_alloc_lock);
-	for (clst=EXFAT_CLST_FIRST; clst < DATA_CNT(bs)+2 && found < nclsts; clst++) {
+	for (clst = EXFAT_CLST_FIRST; clst < DATA_CNT(bs) + 2 && found < nclsts;
+	    clst++) {
 		/* Need to rewrite because of multiple exfat_bitmap_get calls */
-		if (bitmap_is_free(bs, service_id, clst)==EOK) {
-		   /*
-			* The cluster is free. Put it into our stack
-			* of found clusters and mark it as non-free.
-			*/
+		if (bitmap_is_free(bs, service_id, clst) == EOK) {
+			/*
+			 * The cluster is free. Put it into our stack
+			 * of found clusters and mark it as non-free.
+			 */
 			lifo[found] = clst;
 			rc = exfat_set_cluster(bs, service_id, clst,
-				(found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
+			    (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
 			if (rc != EOK)
 				break;
@@ -339,9 +340,7 @@
 
 	/* If something wrong - free the clusters */
-	if (found > 0) {
-		while (found--) {
-			(void) bitmap_clear_cluster(bs, service_id, lifo[found]);
-			(void) exfat_set_cluster(bs, service_id, lifo[found], 0);
-		}
+	while (found--) {
+		(void) bitmap_clear_cluster(bs, service_id, lifo[found]);
+		(void) exfat_set_cluster(bs, service_id, lifo[found], 0);
 	}
 
@@ -490,6 +489,6 @@
 
 	for (i = 0; i < SPC(bs); i++) {
-		rc = exfat_block_get_by_clst(&b, bs, service_id, false, c, NULL, i,
-		    BLOCK_FLAGS_NOREAD);
+		rc = exfat_block_get_by_clst(&b, bs, service_id, false, c, NULL,
+		    i, BLOCK_FLAGS_NOREAD);
 		if (rc != EOK)
 			return rc;
@@ -517,6 +516,6 @@
 		if (rc != EOK)
 			return rc;
-		if (i == blocks-1)
-			count = nodep->size - i*BPS(bs);
+		if (i == blocks - 1)
+			count = nodep->size - i * BPS(bs);
 		memcpy(uctable, b->data, count);
 		uctable += count;
Index: uspace/srv/fs/exfat/exfat_fat.h
===================================================================
--- uspace/srv/fs/exfat/exfat_fat.h	(revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b)
+++ uspace/srv/fs/exfat/exfat_fat.h	(revision 0dbe5ac3da1c850ebb3e4d5701b7b4409a026277)
@@ -58,20 +58,18 @@
 typedef uint32_t exfat_cluster_t;
 
-
 #define exfat_clusters_get(numc, bs, sid, fc) \
     exfat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1)
-extern int exfat_cluster_walk(struct exfat_bs *bs, service_id_t service_id, 
-    exfat_cluster_t firstc, exfat_cluster_t *lastc, uint32_t *numc,
-    uint32_t max_clusters);
-extern int exfat_block_get(block_t **block, struct exfat_bs *bs,
-    struct exfat_node *nodep, aoff64_t bn, int flags);
-extern int exfat_block_get_by_clst(block_t **block, struct exfat_bs *bs, 
-    service_id_t service_id, bool fragmented, exfat_cluster_t fcl,
-    exfat_cluster_t *clp, aoff64_t bn, int flags);
 
-extern int exfat_get_cluster(struct exfat_bs *bs, service_id_t service_id,
-    exfat_cluster_t clst, exfat_cluster_t *value);
-extern int exfat_set_cluster(struct exfat_bs *bs, service_id_t service_id,
-    exfat_cluster_t clst, exfat_cluster_t value);
+extern int exfat_cluster_walk(struct exfat_bs *, service_id_t, 
+    exfat_cluster_t, exfat_cluster_t *, uint32_t *, uint32_t);
+extern int exfat_block_get(block_t **, struct exfat_bs *, struct exfat_node *,
+    aoff64_t, int);
+extern int exfat_block_get_by_clst(block_t **, struct exfat_bs *, service_id_t,
+    bool, exfat_cluster_t, exfat_cluster_t *, aoff64_t, int);
+
+extern int exfat_get_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t,
+    exfat_cluster_t *);
+extern int exfat_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t,
+    exfat_cluster_t);
 extern int exfat_sanity_check(struct exfat_bs *, service_id_t);
 
@@ -83,9 +81,8 @@
     exfat_cluster_t *, exfat_cluster_t *);
 extern int exfat_free_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t);
-extern int exfat_zero_cluster(struct exfat_bs * bs, service_id_t service_id, 
-    exfat_cluster_t mcl);
+extern int exfat_zero_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t);
 
-extern int exfat_read_uctable(struct exfat_bs *bs, struct exfat_node *nodep, 
-    uint8_t *uctable);
+extern int exfat_read_uctable(struct exfat_bs *, struct exfat_node *,
+    uint8_t *);
 
 #endif
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision 0dbe5ac3da1c850ebb3e4d5701b7b4409a026277)
@@ -34,5 +34,6 @@
 /**
  * @file	exfat_ops.c
- * @brief	Implementation of VFS operations for the exFAT file system server.
+ * @brief	Implementation of VFS operations for the exFAT file system
+ *		server.
  */
 
@@ -335,5 +336,6 @@
 	switch (exfat_classify_dentry(d)) {
 	case EXFAT_DENTRY_FILE:
-		nodep->type = (uint16_t_le2host(d->file.attr) & EXFAT_ATTR_SUBDIR)? 
+		nodep->type =
+		    (uint16_t_le2host(d->file.attr) & EXFAT_ATTR_SUBDIR) ? 
 		    EXFAT_DIRECTORY : EXFAT_FILE;
 		rc = exfat_directory_next(&di);
@@ -395,5 +397,6 @@
 }
 
-int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep, exfat_cluster_t clusters)
+int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep,
+    exfat_cluster_t clusters)
 {
 	exfat_bs_t *bs;
@@ -439,5 +442,6 @@
 }
 
-static int exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep, aoff64_t size)
+static int exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep,
+    aoff64_t size)
 {
 	exfat_bs_t *bs;
@@ -505,5 +509,5 @@
 {
 	exfat_node_t *parentp = EXFAT_NODE(pfn);
-	char name[EXFAT_FILENAME_LEN+1];
+	char name[EXFAT_FILENAME_LEN + 1];
 	exfat_file_dentry_t df;
 	exfat_stream_dentry_t ds;
@@ -520,10 +524,11 @@
 		return rc;
 
-	while (exfat_directory_read_file(&di, name, EXFAT_FILENAME_LEN, 
-	    &df, &ds) == EOK) {
+	while (exfat_directory_read_file(&di, name, EXFAT_FILENAME_LEN, &df,
+	    &ds) == EOK) {
 		if (stricmp(name, component) == 0) {
 			/* hit */
 			exfat_node_t *nodep;
-			aoff64_t o = di.pos % (BPS(di.bs) / sizeof(exfat_dentry_t));
+			aoff64_t o = di.pos %
+			    (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);
@@ -734,8 +739,8 @@
 	 */
 	rc = exfat_directory_write_file(&di, name);
-	if (rc!=EOK)
+	if (rc != EOK)
 		return rc;
 	rc = exfat_directory_close(&di);
-	if (rc!=EOK)
+	if (rc != EOK)
 		return rc;
 
@@ -962,5 +967,5 @@
 {
 	int rc;
-	exfat_node_t *rootp=NULL, *bitmapp=NULL, *uctablep=NULL;
+	exfat_node_t *rootp = NULL, *bitmapp = NULL, *uctablep = NULL;
 	enum cache_mode cmode;
 	exfat_bs_t *bs;
@@ -1062,5 +1067,5 @@
 	rc = exfat_node_get_new_by_pos(&bitmapp, service_id, rootp->firstc, 
 	    di.pos);
-	if (rc!=EOK) {
+	if (rc != EOK) {
 		free(rootp);
 		(void) block_cache_fini(service_id);
@@ -1103,5 +1108,5 @@
 	rc = exfat_node_get_new_by_pos(&uctablep, service_id, rootp->firstc, 
 	    di.pos);
-	if (rc!=EOK) {
+	if (rc != EOK) {
 		free(rootp);
 		free(bitmapp);
@@ -1123,5 +1128,5 @@
 
 	rc = exfat_directory_close(&di);
-	if (rc!=EOK) {
+	if (rc != EOK) {
 		free(rootp);
 		free(bitmapp);
@@ -1188,5 +1193,5 @@
 	exfat_node_t *nodep;
 	exfat_bs_t *bs;
-	size_t bytes=0;
+	size_t bytes = 0;
 	block_t *b;
 	int rc;
@@ -1244,5 +1249,5 @@
 			
 		aoff64_t spos = pos;
-		char name[EXFAT_FILENAME_LEN+1];
+		char name[EXFAT_FILENAME_LEN + 1];
 		exfat_file_dentry_t df;
 		exfat_stream_dentry_t ds;
@@ -1260,7 +1265,10 @@
 		}
 
-		rc = exfat_directory_read_file(&di, name, EXFAT_FILENAME_LEN, &df, &ds);
-		if (rc == EOK) goto hit;
-		if (rc == ENOENT) goto miss;
+		rc = exfat_directory_read_file(&di, name, EXFAT_FILENAME_LEN,
+		    &df, &ds);
+		if (rc == EOK)
+		    goto hit;
+		if (rc == ENOENT)
+		    goto miss;
 
 err:
@@ -1281,8 +1289,9 @@
 		pos = di.pos;
 		rc = exfat_directory_close(&di);
-		if (rc!=EOK)
+		if (rc != EOK)
 			goto err;
-		(void) async_data_read_finalize(callid, name, str_size(name) + 1);
-		bytes = (pos - spos)+1;
+		(void) async_data_read_finalize(callid, name,
+		    str_size(name) + 1);
+		bytes = (pos - spos) + 1;
 	}
 
@@ -1395,5 +1404,4 @@
 		return rc;
 	}
-
 
 	*wbytes = bytes;
@@ -1477,5 +1485,4 @@
 };
 
-
 /**
  * @}