Second round NPC formatting changes