Data refactoring