some cleanup to xml #3