Email Sender Refactor