small model refactoring