Nii - some simple refactor