Merged some rules together in grammar, removed unused code in PrettyPrinter