better email validation - minor cleanup