Improve Regex for email validation