Minor cleanup
Merge pull request #4365 from pjackson28/cleanup

Minor cleanup
Resolved merge conflicts