Format clean up, json now takes many args.