some refactoring: on addAddress