Improve pretty-printing