clean up the pretty printer
remove decorations from AST to improve compare semantics