Rewrite to be idiomatic