Cleaned up NPC code

Just as the title says