changing embedded data extraction cleaner so i can handle structs