refacotr: refactoring form DataOperationUgly to DataOperation