refactor Email class