Refine code
Merge pull request #43 from JacksonTian/refine

Refine code