Implement file filtering by name
Clean-up/minor refactor