Patch with your suggested improvements.

Rgds
Pierre