clean up files and add comments
Merge pull request #12 from samzhao88/develop

clean up files and add comments