email refactor part 1?