Code cleanup
Merge pull request #1083 from hurtonm/master

Code cleanup