incorporate first pass feedback from @stefanpenner