SMTP Refactoring