ns refactorings