V4P NPC

Or to clean up my functions.