Got pretty printing working better