Refactor and remove MailerHelper