Made improvements to pretty printing