Cosmetic: use more idiomatic convention