data refactoring