refactor address list