further cleanup, another var issue