mkfs: optimization and code cleanup