Light improvements to notification class