Refactor address representation