Refactor nbhelper

Change-Id: I69d10d164fac3eb319e072447a520905880c31dd
10 files changed