Tweak a few more stylistic things