OK for this time : quite a lot of cosmetics

Signed-off-by: JB Touchard <jbt@txtnet.com>