Merge pull request #2 from missyjcat/code-cleanup

comments cleanup