refactored #find_by