Refactoring 06 - t2flow writer using XPATH: final clean up