Clean up json a bit