I much more like the style you propose, so gladly fixed it on behalf of others :)