Cleanup xmlcomponent code, readability stuff