Minor tweaks to aid clarity/simplicity.