refactoring: code cleanup and improvement (fixed xml etree 'if element:' deprecation warnings).
refactoring: code cleanup and improvement (fixed xml etree 'if element:' deprecation warnings).

Justin-W/clifunland,Justin-W/clifunland