Make code more idiomatic.