Prettyprinting improvements