Cleanup and added CDATA markers.