Minor stylistic tweaks