more semantic tweaks