In progress
It's getting worse, not happy with this
Some cleanup
Minor style cleanup of NotificationManager