Refactor Mailer
Remove coments