Code cleanup.
Merge pull request #61 from charlesmchen/master

Comment cleanup.