Incorporate feedback

- via @mwillbanks on IRC