small cleanups here and there (nw)