code cleanup
Merge pull request #1 from patsimm/master

code cleanup