minor semantic tweaks