Cleaning up highlighting headers