Small tidying of the xml controller