re-adding the pretty-printing that was lost in a later merge