Code cleanup in pvp.lua