Refactor Address Book
IDE junk