Refactoring, vlidate email