Formatting and CLeaning nlsr_ndn.c/h