refactor notification messages