(MESS) minor cleanup. nw.