Some of the changes needed after reading Marv's comments about my pull request