First round of NPC formatting changes