Incorporated Kevin Cooney's feedback from pull-request