Made some final changes to email format