Remove bloat, improve hilighting.