Improve pretty printing
Fix underscore type parameter problem in Proof