Add more descriptive FROM for email notifications.
Clean up and optimizations.