! cleanup (somewhat) the xml controller

Signed-off-by: Spuds <spuds@spudsdesign.com>