Refactored the NotificationServices and brushed them up.