More idiomatic changes for json.Unmarshal