Incorporated pull request feedback from kcooney