Incorporate feedback from @sethvargo