Index: uspace/lib/ext4/libext4_directory.c
===================================================================
--- uspace/lib/ext4/libext4_directory.c	(revision 9b9d37bb7640f27fb362f617f494669ddd3490d3)
+++ uspace/lib/ext4/libext4_directory.c	(revision e68c8340d47c44d590ec9f47a0e81614a5ae66a3)
@@ -142,4 +142,6 @@
 		}
 
+		EXT4FS_DBG("next_block_phys_idx: \%d", next_block_phys_idx);
+
 		rc = block_get(&it->current_block, it->fs->device, next_block_phys_idx,
 		    BLOCK_FLAGS_NONE);
@@ -151,4 +153,5 @@
 
 	it->current_offset = pos;
+
 	return ext4_directory_iterator_set(it, block_size);
 }
Index: uspace/lib/ext4/libext4_filesystem.c
===================================================================
--- uspace/lib/ext4/libext4_filesystem.c	(revision 9b9d37bb7640f27fb362f617f494669ddd3490d3)
+++ uspace/lib/ext4/libext4_filesystem.c	(revision e68c8340d47c44d590ec9f47a0e81614a5ae66a3)
@@ -41,7 +41,4 @@
 #include "libext4.h"
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id)
 {
@@ -86,7 +83,4 @@
 }
 
-/**
- * TODO doxy
- */
 void ext4_filesystem_fini(ext4_filesystem_t *fs)
 {
@@ -95,7 +89,4 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_check_sanity(ext4_filesystem_t *fs)
 {
@@ -110,7 +101,4 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_check_features(ext4_filesystem_t *fs, bool *o_read_only)
 {
@@ -139,12 +127,7 @@
 }
 
-/**
- * TODO doxy
- */
 int ext4_filesystem_get_block_group_ref(ext4_filesystem_t *fs, uint32_t bgid,
     ext4_block_group_ref_t **ref)
 {
-	EXT4FS_DBG("");
-
 	int rc;
 	aoff64_t block_id;
@@ -164,43 +147,24 @@
 	block_id = ext4_superblock_get_first_data_block(fs->superblock) + 1;
 
-	EXT4FS_DBG("block_size = \%d", ext4_superblock_get_block_size(fs->superblock));
-	EXT4FS_DBG("descriptors_per_block = \%d", descriptors_per_block);
-	EXT4FS_DBG("bgid = \%d", bgid);
-	EXT4FS_DBG("first_data_block: \%d", (uint32_t)block_id);
-
 	/* Find the block containing the descriptor we are looking for */
 	block_id += bgid / descriptors_per_block;
 	offset = (bgid % descriptors_per_block) * EXT4_BLOCK_GROUP_DESCRIPTOR_SIZE;
 
-	EXT4FS_DBG("updated block_id: \%d", (uint32_t)block_id);
-
 	rc = block_get(&newref->block, fs->device, block_id, 0);
 	if (rc != EOK) {
-
-		EXT4FS_DBG("block_get error: \%d", rc);
-
 		free(newref);
 		return rc;
 	}
 
-	EXT4FS_DBG("block read");
-
 	newref->block_group = newref->block->data + offset;
 
 	*ref = newref;
 
-	EXT4FS_DBG("finished");
-
-	return EOK;
-}
-
-/**
- * TODO doxy
- */
+	return EOK;
+}
+
 int ext4_filesystem_get_inode_ref(ext4_filesystem_t *fs, uint32_t index,
     ext4_inode_ref_t **ref)
 {
-	EXT4FS_DBG("");
-
 	int rc;
 	aoff64_t block_id;
@@ -221,9 +185,5 @@
 	}
 
-	EXT4FS_DBG("allocated");
-
 	inodes_per_group = ext4_superblock_get_inodes_per_group(fs->superblock);
-
-	EXT4FS_DBG("inodes_per_group_loaded");
 
 	/* inode numbers are 1-based, but it is simpler to work with 0-based
@@ -234,8 +194,4 @@
 	offset_in_group = index % inodes_per_group;
 
-	EXT4FS_DBG("index: \%d", index);
-	EXT4FS_DBG("inodes_per_group: \%d", inodes_per_group);
-	EXT4FS_DBG("bg_id: \%d", block_group);
-
 	rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
 	if (rc != EOK) {
@@ -243,12 +199,8 @@
 		return rc;
 	}
-
-	EXT4FS_DBG("block_group_ref loaded");
 
 	inode_table_start = ext4_block_group_get_inode_table_first_block(
 	    bg_ref->block_group);
 
-	EXT4FS_DBG("inode_table block loaded");
-
 	inode_size = ext4_superblock_get_inode_size(fs->superblock);
 	block_size = ext4_superblock_get_block_size(fs->superblock);
@@ -259,6 +211,4 @@
 	offset_in_block = byte_offset_in_group % block_size;
 
-	EXT4FS_DBG("superblock info loaded");
-
 	rc = block_get(&newref->block, fs->device, block_id, 0);
 	if (rc != EOK) {
@@ -266,6 +216,4 @@
 		return rc;
 	}
-
-	EXT4FS_DBG("block got");
 
 	newref->inode = newref->block->data + offset_in_block;
@@ -277,8 +225,7 @@
 	*ref = newref;
 
-	EXT4FS_DBG("finished");
-
-	return EOK;
-}
+	return EOK;
+}
+
 
 int ext4_filesystem_put_inode_ref(ext4_inode_ref_t *ref)
@@ -307,5 +254,5 @@
 
 	/* Handle simple case when we are dealing with direct reference */
-	if (iblock < EXT4_INODE_DIRECT_BLOCKS) {
+	if (iblock < EXT4_INODE_DIRECT_BLOCK_COUNT) {
 		current_block = ext4_inode_get_direct_block(inode, (uint32_t)iblock);
 		*fblock = current_block;
@@ -317,5 +264,5 @@
 	 */
 	block_ids_per_block = ext4_superblock_get_block_size(fs->superblock) / sizeof(uint32_t);
-	limits[0] = EXT4_INODE_DIRECT_BLOCKS;
+	limits[0] = EXT4_INODE_DIRECT_BLOCK_COUNT;
 	blocks_per_level[0] = 1;
 	for (i = 1; i < 4; i++) {