Code cleanup
Merge pull request #1125 from hurtonm/master

Code cleanup