data processing refactoring 200314