Nii - more minor refactor