Cleaned up EmailService class.