refactored finder to only have one find by method