model refactoring
min