Cleaned up use of MailAddress
Merge pull request #108 from mezz/tradingCleanup

Cleaned up use of MailAddress