rework nmp nomen 1 to 4
clean code