Code optimization
Merge pull request #250 from dreamsxin/model

Code optimization