refactored the finder method