model: simple refactoring