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

cleanups of the code (no functional changes)