Refactor mailer methods
Nice and tidy