improve email templating