Use more idiomatic way