Refactor addresses and their setup