Cleanup xmlcomponentstore for some minor readability