Code cleanup
Merge pull request #1093 from hurtonm/master

Code cleanup