Added local pretty print functions
Resolved merge conflicts