refactoring of address