fixup! Refactor xml_importer.py for easier reading.