Change utils.clean_data to allow for cleaning / renaming of keys