Refactored 'Email' Class