Code refactoring (model)