Move filename generation outside if-else block in datasets.py#314