clean comments and code
fix merge conflict
Merge pull request #12 from GabeMedrash/master

standardize comments and refactor