Start of code cleanup and unifying the XML and DB models into the same struct