Phase 2 - Added parameters to mailer service, and cleaned up mailer service code.