ok, some cosmetic changes for David :-)