Global: minor changes of style