Add pretty printing
Cleanup