Fix up the prettty printer a bit more