[nps fix] block and setting messages only pared for correct AC_ID in nps
[nps] whitespace and style fixes