Refactor some xml files