Improve pretty printer