Cleaned up email/notification code
Updated Version to 5.2.3