Minor refactoring of FileListing