#121 - Updates based off pull request feedback