Minor Notifications refactorings

Also a ton of commenting and indexes that may come in handy
at a later stage