removed the places where AST was modified.
removed the tostring() where it is not necessary.