Restructure email and content

Fixed code structure and content