[PIERRE] [AN DOLLE] code style fixes.