Improved Pretty Printing