Cleaned code in SendEmailCommand