small notice refactor