refactoring nomi