some cleanup, better aggregate notification message