Some small changes to Emailing.

Made the code cleaner to email and thus easier to update down the road.