Cleanup and context highlighting