KRACOEUS-7196 made changes per pull request notes, and cleaned of the
XML a bit