Refactoring of tableModels