Typos and cleanup.
Merge pull request #2 from nanliu/cleanup

Typos and cleanup.