cleanups of the code (no functional changes)
Merge pull request #456 from rorygraves/2_10_cleanup

cleanups of the code (no functional changes)