[PVP] Moved initial class selection into a procedure