Refactor noms