Refactor EmailValidator