more person / address refactoring