Refine code
Merge pull request #40 from JacksonTian/refine

Refine code