More formatting changes, this time mainly for Json DSL