Refactoring and Start Implementing an Email Service