Idiomatic change to API