remove noise from the notification and reorganize stuff
Merge pull request #2 from getpenelope/fix_email_notification_402

remove noise from the notification and reorganize stuff