Improve email format