Cleaned up use of MailAddress