Cleaning up batch()