Cosmetic changes and JSON pretty-print