Minor style and language tweaks