Minor refactoring to NEI integration