refactored all models
refactored all models