refactor with helpers for location/phone