Further polish on pretty_print