nearby_venues refactor (after working merge)