Refactoring AddressBook