Start to improove readability of -set.xml by making one-style strings (2 spaces instead of everything possible things).