Clean up ; refactor to use validateNotification()