Cleanup of highlighting in HTML generation