more code/file cleanup
Merge pull request #6 from tiramizoo/more-cleanup

more code/file cleanup