Refactor Address Controller