Refactor Batch