Refactoring code
Refactoring code mail service
Refactoring code mail service