Code cleanup
Merge pull request #1177 from hurtonm/master

Code cleanup