Code cleanup
Merge pull request #1163 from hurtonm/master

Code cleanup