Refine the code
Merge pull request #6 from JacksonTian/refine2

Refine the code