some small cleanup (nw)