Add pretty printing
Improve pretty printing