cleanup in the XML classes
added in phpcs coding rules