Minor code cleanup from comment in pull request #1748.
Merge pull request #1749 from pjackson28/master

Minor code cleanup from comment in pull request #1748