end of refactoring stary of notifications