some refactoring on model