Improve upload dataset UI | Reformat code