[PVP] Reorganized and optimized end match