Soldier NPC class tidy up