XML syntax cleanup