refactoring of data