Refactor/notifications generator