ndp: code cleanup