formatting and style
preserve scopes in symbol table
remove CRs
improve toString methods