refactor address list
Merge pull request #764 from zendesk/grosser/ref-add

refactor address list