Refactor find_contact method