refactors to reduce dependencies within TextTemplating classes in  CodeGeneration project