nanops small refactoring