Minor tweaks based on feedback