Make keyword more idiomatic