Updates for Joe's comments prior to pull request being merged.