Moved values into attributes of xml elements where they belong
2 files changed