XML formatting code is now less hacky and a bit more comprehensible