batch refactor