[NT] Small refactoring