refactoring Email