bug correction and remove whitespaces around identifiers in the xml code