More work on refactoring NPPES/NPI