refactoring; integration of the address for showing it on client