Email sending cleaned up