Stylistic code tweaks