SSP-796 fixed bug in 000027.xml.  Code clean up and formatting changes