Fix refactor.
Merge pull request #5 from xtao/refactor

Fix refactor.