Minor changes for formatting and fixing an issue caused by the fact that the XML data could not be found