Alright, so maybe not quite Pescado-clean but regular clean anyway, that should be enough I suppose. :)

Thank you so much for your help, now I feel much better prepared when I get on the extraction and upload project! :)