Code cleanup
Merge pull request #770 from hurtonm/master

Code cleanup