Clean up system.xml + add CDATA comment for saftey