data refactor

data refactor