Models, small refactoring
Models, small refactoring