Refactoring MailService #11