code clean up
Merge pull request #10 from phillwilt/cleanup

code clean up