Refactor dataset.