Minor tweaks from reviewer