Little design and semantic tweaks