Cleaner file handling and every file is in csv now