OK, I did a quick and dirty (which means sloppy), and I probably overdid it just to see if this is on the track of your suggested improvement.