Cleanup.
Adjusted email notification strings and did some more cleanup.