cleanup
Merge pull request #74 from yogthos/master

code cleanup