Bunch of stylistic fixes.