-notification and event relationships / Code clean up
-Generating/displaying notifications and events