code cleanup
Merge pull request #70 from marsmith/master

code cleanup