refactor datanamix