Make more idiomatic