Refactoring

Refactorize of model,