Clean up and Update the rule of highlight.