Move notice logic into seperate module.