Update Email notification and reorganize Notifier.php functions