minor ns refactor