More stylistic tweaks