Tidied up pretty-printing!