refactor finders to remove duplication