clean up PvP and add Classification