Corrected my AddressBook class and refactored some of the other code to use it