Make ns statements more idiomatic