Cleanup.
Refactored XML handling.