Fix up some spacing and json