Restructuration.
More options, pretty print.