More idiomatic change