Minor code cleanup from comments in pull request #1736.
Merge pull request #1748 from pjackson28/master

Minor code cleanup from comments in pull request #1736