Cleanup, add email sending