Simplify script
Update dataset fetching file