bit of model refactoring