Added pretty printing
Fixed merge issues