Test XML Parser-Organize Code

Remove unnecessary code, organize imports
Organize code

Organize code