Stylistic tweaks