more clean ups
Merge pull request #3 from twokul/more-cleanup

more clean ups