Some code cleaning taken place.
email functionality is on testing mode.