Address Book Clean Up

Need to amend the tep_address_label function at some point...