Code cleanup
switched back to scheduling the notifiation