A few minor tweaks based on alex feedback