refactor models, thirth commit