refactor (nw)