added closure for mailer and more style