minor cleanup (nw)