remove symbol + from notice message
refactor the code