Fix style issues in xml files