ListFs: refactoring