Bunch of minor changes (mostly style).