incorp @tdavisson's edits

sorry Tyler, I was too impatient to wait for your pull request