Improve email validation