Refactoring, phone and email validation