A few stylistic fixes