Tweaks + comments re: review from @jmcphers