Cleaned up and improved encapsulation in the MailAddress API