0000506: Single xml solution - mostly coding style fixes