cleanup and progress
Merge pull request #6 from jay-doubleyou/master

cleanup and progress