Cleanup and add email