Refactorize some code to make it simpler
Merge pull request #49 from Obvious/xiao-refactorize

Refactorize some code to make it simpler