Improve Email Validation