add more model

+ add models
+ clean up some code