Initial clean up in FileLister