Tweaks following feedback from @commuterjoy