Cleaned up some notification code