refactoring+email