minor cleanup. nw.