Slight change to the highlighting algorithm, some cleanup.