Smallish code improvement Cleaner and prepare for the forthcoming NPCs that will also be handled here.