Code cleanup
Merge pull request #1115 from hurtonm/master

Code cleanup