Refactor user notices