Minor tweaks as per @simonster's suggestions