Clean up dataset iteration