Update notice message and comment