The old guy did an awesome job polishing the headlights. However, I think an alternate method could be just to mask off the headlights after polishing and then "clear-coat" them with a tough quality clear paint like Imron aircraft paint (bug and rock resistant paint used specifically on aircraft) which wouldn't leave any tell-tale lines around the horns. Just my 2-cents.