Incorporating feedback from @springmeyer review of pull #53