A few stylistic tweaks