Cleanup json formatting