Refactor and consolidate XML processing
12 files changed