little refactor
Merge pull request #10 from liaofeng/little_refactor

Little refactor