Clean up print messages
Bug fix xml string