made general notification name and cleanup