SMTP refactoring