restructure the sent emails to have subject and body for confirmation code
remove unused comments