Addressed code review comments
Reinstating necessary fixes to ToString method for AST