Minor code cleanup from comments in #2115.
Merge pull request #2118 from pjackson28/master

Minor code cleanup from comments in #2115