Filer ordered and minor refactorings