more local data refactoring