Comments and cleanup of NPC

Commented a little, removed unnecessary code, etc. The basic stuff